delete old and add new (big restructure after move to git

This commit is contained in:
Mario Fetka 2011-11-20 10:06:30 +01:00
parent d9b6300a83
commit 94beb63256
134 changed files with 13330 additions and 6570 deletions

View File

@ -1,25 +0,0 @@
# ChangeLog for app-emulation/open-vm-tools-kmod
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools-kmod/ChangeLog,v 1.2 2009/12/20 14:04:01 vadimk Exp $
26 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
+open-vm-modules-0.0.20091015.201664.ebuild,
+open-vm-modules-0.0.20091216.217847.ebuild,
-open-vm-modules-2009.05.22_p167859.ebuild,
-open-vm-modules-2009.06.18_p172495.ebuild,
-open-vm-modules-2009.07.22_p179896.ebuild,
-open-vm-modules-2009.10.15_p201664.ebuild, metadata.xml:
Bump to new naming schema
*open-vm-tools-kmod-0.0.20091216.217847 (20 Dec 2009)
20 Dec 2009; Vadim Kuznetsov <vadimk@gentoo.org>
+open-vm-tools-kmod-0.0.20091216.217847.ebuild:
Version bump.
*open-vm-tools-kmod-0.0.20091015.201664 (29 Oct 2009)
29 Oct 2009; Vadim Kuznetsov vadimk@gentoo.org
+open-vm-tools-kmod-0.0.20091015.201664.ebuild, +metadata.xml:
open-vm-tools kernel modules.

View File

@ -1,6 +0,0 @@
DIST open-vm-tools-2009.10.15-201664.tar.gz 3507956 RMD160 14a26a7423c97398afe007902ffd50b90328dd38 SHA1 f678d96dad4107c811f312a8bb1da97127b96ce3 SHA256 2a70d2ed605b898192def775958b596c7c4f26dc02de30165a3325af18e16ff5
DIST open-vm-tools-2009.12.16-217847.tar.gz 3557356 RMD160 ed473e82672178acb2de4c9d8fcd95dd6655735f SHA1 6bf9dc1441415ccad6fcfb1cfccaf75c64d05424 SHA256 55554d22a9733532416e76eaa7ff1bad68f4b695fb75d03dfa3fb6bf32210ace
EBUILD open-vm-modules-0.0.20091015.201664.ebuild 333 RMD160 e17fd6564cbb65b6138f93c50e3dbbd85d42abd4 SHA1 67ab9bad95cb0a0f8ab17f52d038f7d34043f15c SHA256 e5c5f2c1da7f0f460528aed31411a5eb6fe886231733741bcebaa54418b486d6
EBUILD open-vm-modules-0.0.20091216.217847.ebuild 333 RMD160 e17fd6564cbb65b6138f93c50e3dbbd85d42abd4 SHA1 67ab9bad95cb0a0f8ab17f52d038f7d34043f15c SHA256 e5c5f2c1da7f0f460528aed31411a5eb6fe886231733741bcebaa54418b486d6
MISC ChangeLog 984 RMD160 09638d7be02b7399f132b8e40297ed80701b59cb SHA1 43fde3efcd6ae29e302faac933b0236ee8bcabc2 SHA256 8d2d88e4239be27b60f554bd34283258118aae3ae7397df831a3636a790302b1
MISC metadata.xml 503 RMD160 fc12351dcb94137033d4810fc69d0211e0d0ec93 SHA1 bbe6feea6eff4574c897555e35649c6bd1f01963 SHA256 bed306dcff1b6d4243cf63ba912c88d3a630081501891687925c9dbf37995e00

View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>vmware</herd>
<maintainer>
<email>vadimk@gentoo.org</email>
</maintainer>
<longdescription>
The Open Virtual Machine Tools (open-vm-tools) are the open source
implementation of VMware Tools. They are a set of guest operating system
virtualization components that enhance performance and user experience
of virtual machines.
</longdescription>
</pkgmetadata>

View File

@ -1,16 +0,0 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
VM_MODULE_LIST="pvscsi vmblock vmci vmhgfs vmmemctl vmsync vmxnet vmxnet3 vsock"
inherit vmware-mod-2 versionator
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND=""
DEPEND="${RDEPEND}
virtual/linux-sources"

View File

@ -1,16 +0,0 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
VM_MODULE_LIST="pvscsi vmblock vmci vmhgfs vmmemctl vmsync vmxnet vmxnet3 vsock"
inherit vmware-mod-2 versionator
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND=""
DEPEND="${RDEPEND}
virtual/linux-sources"

View File

@ -1,186 +0,0 @@
# 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.29 2009/12/20 14:05:42 vadimk Exp $
26 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
-open-vm-tools-0.0.2009.05.22_p167859.ebuild,
+open-vm-tools-0.0.20091015.201664.ebuild,
+open-vm-tools-0.0.20091216.217847.ebuild,
-open-vm-tools-0.1.2009.06.18_p172495.ebuild,
-open-vm-tools-0.1.2009.07.22_p179896.ebuild,
-open-vm-tools-0.1.2009.10.15_p201664.ebuild,
+files/checkvm-pie-safety.patch, +files/open-vm-tools.initd,
+files/tools.conf, +files/xautostart.conf, metadata.xml:
Bump to new naming schema
*open-vm-tools-0.0.20091216.217847 (20 Dec 2009)
20 Dec 2009; Vadim Kuznetsov <vadimk@gentoo.org>
+open-vm-tools-0.0.20091216.217847.ebuild, files/open-vm-tools.initd:
Version bump. Bug 297603.
Bug 291236. Bug 283654. Thanks to Brandon Holbrook et al.
Bug 294968. Thanks to Vladimir Kulev.
10 Nov 2009; Vadim Kuznetsov vadimk@gentoo.org
open-vm-tools-0.0.20091015.201664.ebuild:
Bug 292176.
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)
29 Oct 2009; Vadim Kuznetsov vadimk@gentoo.org
+files/default-scripts1.patch, -open-vm-tools-0.0.20090522.167859.ebuild,
-open-vm-tools-0.0.20090618.172495.ebuild,
+open-vm-tools-0.0.20091015.201664.ebuild, -files/wiper-warning-fix.patch:
version bump. ebuild split. see open-vm-tools-kmod.
*open-vm-tools-0.0.20090824.187411 (27 Aug 2009)
27 Aug 2009; Vadim Kuznetsov vadimk@gentoo.org -files/10-vmware-tools,
-open-vm-tools-0.0.20090121.142982.ebuild,
+open-vm-tools-0.0.20090824.187411.ebuild,
-files/2.6.28.1-api-break.patch,
-open-vm-tools-0.0.20090318.154848.ebuild:
version bump. clean old ebuilds
23 Aug 2009; Vadim Kuznetsov vadimk@gentoo.org
-open-vm-tools-0.0.20080515.93241.ebuild,
-open-vm-tools-0.0.20080808.109361-r1.ebuild,
-open-vm-tools-0.0.20081223.137496.ebuild:
clean up old ebuilds
*open-vm-tools-0.0.20090722.179896 (24 Jul 2009)
24 Jul 2009; Vadim Kuznetsov vadimk@gentoo.org
+open-vm-tools-0.0.20090722.179896.ebuild:
Version bump.
*open-vm-tools-0.0.20090618.172495-r2 (10 Jul 2009)
10 Jul 2009; Vadim Kuznetsov vadimk@gentoo.org
-open-vm-tools-0.0.20090618.172495-r1.ebuild,
+open-vm-tools-0.0.20090618.172495-r2.ebuild:
re-fixing wmtoolsd plugin path
*open-vm-tools-0.0.20090618.172495-r1 (09 Jul 2009)
09 Jul 2009; Vadim Kuznetsov vadimk@gentoo.org
+open-vm-tools-0.0.20090618.172495-r1.ebuild, metadata.xml:
Fixes bugs 273211, 270433, 260878. Hardcoded procpc, Werror, general
ebuild clean up and missing dependencies. USE flags are added: doc, fuse.
However, vmblock-fuse still needs init script changes.
*open-vm-tools-0.0.20090618.172495 (30 Jun 2009)
30 Jun 2009; Vadim Kuznetsov vadimk@gentoo.org
open-vm-tools-0.0.20090522.167859.ebuild,
+open-vm-tools-0.0.20090618.172495.ebuild:
Version bump. Bug 273887 - missing dev-libs/glib dependency.
08 Jun 2009; Vadim Kuznetsov vadimk@gentoo.org
open-vm-tools-0.0.20090522.167859.ebuild:
with-x is correct.
08 Jun 2009; Vadim Kuznetsov vadimk@gentoo.org
+files/wiper-warning-fix.patch:
Missing patch.
*open-vm-tools-0.0.20090522.167859 (07 Jun 2009)
07 Jun 2009; Vadim Kuznetsov vadimk@gentoo.org
+open-vm-tools-0.0.20090522.167859.ebuild, +files/open-vm-tools.initd:
Version bump.
*open-vm-tools-0.0.20090318.154848 (04 Jun 2009)
04 Jun 2009; Vadim Kuznetsov vadimk@gentoo.org
+open-vm-tools-0.0.20090318.154848.ebuild:
Version bump. ebuild from overlay.
*open-vm-tools-0.0.20090121.142982 (08 Feb 2009)
08 Feb 2009; Mike Auty <ikelos@gentoo.org>
+files/2.6.28.1-api-break.patch, +files/open-vm-tools.desktop,
+open-vm-tools-0.0.20090121.142982.ebuild:
Version bump, fixes bug 256678. Thanks to John Plesmid for the testing.
25 Jan 2009; Mike Auty <ikelos@gentoo.org>
open-vm-tools-0.0.20081223.137496.ebuild:
Remove warning about hardened from latest open-vm-tools. Closes bug
200376.
05 Jan 2009; Markus Meier <maekke@gentoo.org> metadata.xml:
drop local icu USE-flag description, as it's global now
*open-vm-tools-0.0.20081223.137496 (31 Dec 2008)
31 Dec 2008; Mike Auty <ikelos@gentoo.org>
-open-vm-tools-0.0.20080123.74039.ebuild,
-open-vm-tools-0.0.20080414.87182.ebuild,
+open-vm-tools-0.0.20081223.137496.ebuild:
Version bump, builds with 2.6.27+ and fixes unity/xinerama issue (bug
249293 and bug 247324).
19 Nov 2008; Mike Auty <ikelos@gentoo.org>
open-vm-tools-0.0.20080808.109361-r1.ebuild:
Alter the hardened warning message.
*open-vm-tools-0.0.20080808.109361-r1 (19 Oct 2008)
19 Oct 2008; Mike Auty <ikelos@gentoo.org>
-open-vm-tools-0.0.20080808.109361.ebuild,
+open-vm-tools-0.0.20080808.109361-r1.ebuild:
Bump to fix bug 231525.
31 Aug 2008; Mike Auty <ikelos@gentoo.org> +files/10-vmware-tools:
Add missing file 10-vmware-tools
*open-vm-tools-0.0.20080808.109361 (30 Aug 2008)
30 Aug 2008; Mike Auty <ikelos@gentoo.org> metadata.xml,
+open-vm-tools-0.0.20080808.109361.ebuild:
Version bump, now with unity and 2.6.26 support.
28 Jul 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
add GLEP 56 USE flag desc from use.local.desc
*open-vm-tools-0.0.20080414.87182 (26 Apr 2008)
26 Apr 2008; Mike Auty <ikelos@gentoo.org>
+open-vm-tools-0.0.20080414.87182.ebuild:
Version bump.
01 Feb 2008; Diego Pettenò <flameeyes@gentoo.org> files/open-vm.initd:
Update init script to work with current development version of OpenRC
(checkroot -> root; checkfs -> fsck).
31 Jan 2008; Mike Auty <ikelos@gentoo.org> ChangeLog:
Re-sign digestless manifest.
*open-vm-tools-0.0.20080123.74039 (30 Jan 2008)
30 Jan 2008; Mike Auty <ikelos@gentoo.org>
-files/open-vm-tools-kernel_stdint-soren.patch,
-open-vm-tools-0.0.20071121.64693-r1.ebuild,
+open-vm-tools-0.0.20080123.74039.ebuild:
Version bump and remove the broken masked version.
*open-vm-tools-0.0.20071121.64693-r1 (28 Jan 2008)
28 Jan 2008; Mike Auty <ikelos@gentoo.org>
+files/open-vm-tools-kernel_stdint-soren.patch,
+open-vm-tools-0.0.20071121.64693-r1.ebuild:
Fix kernel build issues.
*open-vm-tools-0.0.20071121.64693 (22 Dec 2007)
22 Dec 2007; Mike Auty <ikelos@gentoo.org> +files/disable-toolbox.patch,
+files/open-vm.confd, +files/open-vm.initd, +files/tools.conf,
+files/xautostart.conf, +metadata.xml,
+open-vm-tools-0.0.20071121.64693.ebuild:
Initial commit. This should be usable for both ESX server, workstation,
player and normal server.

View File

@ -1,18 +0,0 @@
AUX checkvm-pie-safety.patch 2043 RMD160 c73a1e3afe0085d26d7814410bc26fb8ea5062e7 SHA1 1b86588a3447b09924751ef38b914912d671f4b5 SHA256 e3e27f36c8ffad08b3ca038d9ebb13c5d1b36e003fb9a7d8eaa265fde802b1e0
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-2009.05.22-167859-libproc-1.patch 735 RMD160 84fb9eff574b0a3649d81d486f254961023581c9 SHA1 f8bad2ca564256e249d32dac2a8c78c9a377a853 SHA256 8c4dd0efa7405d358b18c7447da34288245206795d0ab9b9b261fae71bb588a2
AUX open-vm-tools-build-fix.patch 836 RMD160 463fd9f2fb2b704fe8d3eab41c211f21ae47818c SHA1 075d14e85e46eabe5a6a1a0a5d318453c323b9e9 SHA256 07d9c7bb228e7d5d1299e5fb5052109218e5d1ad074b4ea8fe2b54f22cc26ed6
AUX open-vm-tools.desktop 127 RMD160 375ec8cd688a5fe0609076798e515c048be81c15 SHA1 6b6adcb93fbcb11e1638d6a80b3828256f880dcf SHA256 7cb78f0d94f1849aa964bc8e9d9a6c49955ba1a9b937174b1c266a9cc8eb4bc3
AUX open-vm-tools.initd 1879 RMD160 bfccf434f969272b5c910b7c8e5b90de223ff410 SHA1 14314bfc1db3ddc724804c14ab9ddbd892948b10 SHA256 a01fe6ac2f2eeaf14808cc54d44b0cbdd3989e5cdc99feb3efb97b3959b6655a
AUX open-vm.confd 88 RMD160 5e398024e72a871f258d73e09f02e37a815443b0 SHA1 56133c21c6d29243ac81a9c1ada61616778f3ce2 SHA256 180a2b6d9d18af319b79b2ca6ebf1020b63e5ebf2f601a63c1a9f9f7d2e0b95c
AUX open-vm.initd 1875 RMD160 9d2cc36fd93e70ae20eecd49b10c4da0e09aad69 SHA1 1702f267d32ca138e0e99d9ed86b4abc32cc3997 SHA256 1799b78836441b389de0b3d92aad80fcf020fe8b57da4f6d6999f86ee87f51bf
AUX tools.conf 21 RMD160 88b5b8c8e088333e9c00b2e1c3f3572553342e7b SHA1 42a670b887751dbe9317624dd11068390d1780b0 SHA256 05dcb62e54991ca5546066e4d04b50be98fb0cc229168d4d73df8cf8a94c068c
AUX wiper-warning-fix.patch 418 RMD160 d3595ca361e1b330e22ec10b33b19813df94ff82 SHA1 ff644d5fa4e5d4e5017ce843cd09ab282e4dcd9a SHA256 3678c0ab683336e645a0c2e1c2167ad6fd094784722b63c6e66c435d685ed712
AUX xautostart.conf 59 RMD160 ca1ea3f1b82caa6e97d94835d88a39a6f153ff7a SHA1 92ba86e426fdaa3de1a8aad56db2d2ac358949a1 SHA256 13398e0ffcd7005bc8c92f3cd62865d2601e52fc980a4702fa252bef5c1efcc7
DIST open-vm-tools-2009.10.15-201664.tar.gz 3507956 RMD160 14a26a7423c97398afe007902ffd50b90328dd38 SHA1 f678d96dad4107c811f312a8bb1da97127b96ce3 SHA256 2a70d2ed605b898192def775958b596c7c4f26dc02de30165a3325af18e16ff5
DIST open-vm-tools-2009.12.16-217847.tar.gz 3557356 RMD160 ed473e82672178acb2de4c9d8fcd95dd6655735f SHA1 6bf9dc1441415ccad6fcfb1cfccaf75c64d05424 SHA256 55554d22a9733532416e76eaa7ff1bad68f4b695fb75d03dfa3fb6bf32210ace
EBUILD open-vm-tools-0.0.20091015.201664.ebuild 2735 RMD160 a276ca210f22eb2894efb1e906ba358d329e4703 SHA1 0962a2515b0d69258ca3ef0744d936ed5108ab8d SHA256 065746ed7f22c9c911a8eefe5202095888f45929b628e52fed9bd64a876f01fe
EBUILD open-vm-tools-0.0.20091216.217847.ebuild 2833 RMD160 1dbd07be0ea6f371aef0b31c22bb88642893eac5 SHA1 2076c2c888afa4ea514c4234065ac12312153c1b SHA256 d816b78921be8d3b23186e32da7bd09743344b04074c610e4b14fe97daf7612d
MISC ChangeLog 6786 RMD160 479f718ce5fc0d868a4ee69c721f090775d4b0cc SHA1 1d8202ffc1eb41c38f6dbe0efbb1c2fcc74b2579 SHA256 b4b766b282ff78a9a5c2d002a607e221318bbdc203a103c767c504f860adc5b1
MISC metadata.xml 791 RMD160 fdc392df0eb6c2b1ee6bb9cf2b96b87c23c5883d SHA1 1dbba034c610754769c810a38a0adf4c3aded1f6 SHA256 85ee302699fd64bd96f311935e21847e0d5d2c11d0654c1a9eac7ded2a1bf1b2

View File

@ -1,67 +0,0 @@
From: Gordon Malm <gengor@gentoo.org>
Make inline asm PIC-safe (do not clobber ebx).
Thanks and credit to Anthony Basile for all his help and testing.
Reference: http://bugs.gentoo.org/200376
--- 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;

View File

@ -1,139 +0,0 @@
diff --git a/scripts/linux/resume-vm-default b/scripts/linux/resume-vm-default
index cebbba0..dbd38a6 100644
--- a/scripts/linux/resume-vm-default
+++ b/scripts/linux/resume-vm-default
@@ -25,41 +25,10 @@
echo `date` ": Executing '$0'"
echo
-find_networking_script() {
- local script="error"
- for dir in "/etc/init.d" "/sbin/init.d" "/etc" "/etc/rc.d" ; do
- if [ -d "$dir/rc0.d" ] &&
- [ -d "$dir/rc1.d" ] &&
- [ -d "$dir/rc2.d" ] &&
- [ -d "$dir/rc3.d" ] &&
- [ -d "$dir/rc4.d" ] &&
- [ -d "$dir/rc5.d" ] &&
- [ -d "$dir/rc6.d" ]; then
-
- # Now find the appropriate networking script.
- if [ -d "$dir/init.d" ]; then
- if [ -x "$dir/init.d/network" ]; then
- script="$dir/init.d/network"
- elif [ -x "$dir/init.d/networking" ]; then
- script="$dir/init.d/networking"
- fi
- else
- if [ -x "$dir/network" ]; then
- script="$dir/network"
- elif [ -x "$dir/networking" ]; then
- script="$dir/networking"
- fi
- fi
- fi
- done
-
- echo "$script"
-}
-
rescue_NIC() {
niclist="/var/run/vmware-active-nics"
- ifup_path=`which ifup 2>/dev/null`;
+ ifup_path="/etc/init.d/net.";
if [ $? -ne 0 ]; then
return 1;
fi
@@ -76,7 +45,7 @@ rescue_NIC() {
else
echo `date` "[rescue_nic] activating $nic ..."
- $ifup_path $nic
+ $ifup_path$nic restart
fi
done < $niclist
@@ -95,15 +64,8 @@ if [ -d "$scriptsdir" ]; then
done
fi
-network=`find_networking_script`
-if [ "$network" != "error" ]; then
- "$network" restart
- # Continue even if the networking init script wasn't successful.
- status=0
-else
- echo "networking script not found"
- status=1
-fi
+# Continue even if the networking init script wasn't successful.
+status=0
if [ $status -eq 0 ]; then
rescue_NIC
diff --git a/scripts/linux/suspend-vm-default b/scripts/linux/suspend-vm-default
index 80bf5b9..f590194 100644
--- a/scripts/linux/suspend-vm-default
+++ b/scripts/linux/suspend-vm-default
@@ -25,37 +25,6 @@
echo `date` ": Executing '$0'"
echo
-find_networking_script() {
- local script="error"
- for dir in "/etc/init.d" "/sbin/init.d" "/etc" "/etc/rc.d" ; do
- if [ -d "$dir/rc0.d" ] &&
- [ -d "$dir/rc1.d" ] &&
- [ -d "$dir/rc2.d" ] &&
- [ -d "$dir/rc3.d" ] &&
- [ -d "$dir/rc4.d" ] &&
- [ -d "$dir/rc5.d" ] &&
- [ -d "$dir/rc6.d" ]; then
-
- # Now find the appropriate networking script.
- if [ -d "$dir/init.d" ]; then
- if [ -x "$dir/init.d/network" ]; then
- script="$dir/init.d/network"
- elif [ -x "$dir/init.d/networking" ]; then
- script="$dir/init.d/networking"
- fi
- else
- if [ -x "$dir/network" ]; then
- script="$dir/network"
- elif [ -x "$dir/networking" ]; then
- script="$dir/networking"
- fi
- fi
- fi
- done
-
- echo "$script"
-}
-
save_active_NIC_list() {
ifconfig_path=`which ifconfig 2>/dev/null`
if [ $? ]; then
@@ -76,15 +45,12 @@ fi
save_active_NIC_list
-network=`find_networking_script`
-if [ "$network" != "error" ]; then
- "$network" stop
- # If the network is down, this may fail but that's not a good reason
- # to prevent the suspend.
- status=0
-else
- echo "networking script not found"
- status=1
-fi
+for network in `ls /etc/init.d/net.*`;
+do
+ "$network" stop
+done
+# If the network is down, this may fail but that's not a good reason
+# to prevent the suspend.
+status=0
exit "$status"

View File

@ -1,163 +0,0 @@
diff -ur scripts.orig/linux/resume-vm-default scripts/linux/resume-vm-default
--- scripts.orig/linux/resume-vm-default 2009-10-26 14:08:44.000000000 -0400
+++ scripts/linux/resume-vm-default 2009-10-26 14:07:29.000000000 -0400
@@ -25,37 +25,6 @@
echo `date` ": Executing '$0'"
echo
-find_networking_script() {
- local script="error"
- for dir in "/etc/init.d" "/sbin/init.d" "/etc" "/etc/rc.d" ; do
- if [ -d "$dir/rc0.d" ] &&
- [ -d "$dir/rc1.d" ] &&
- [ -d "$dir/rc2.d" ] &&
- [ -d "$dir/rc3.d" ] &&
- [ -d "$dir/rc4.d" ] &&
- [ -d "$dir/rc5.d" ] &&
- [ -d "$dir/rc6.d" ]; then
-
- # Now find the appropriate networking script.
- if [ -d "$dir/init.d" ]; then
- if [ -x "$dir/init.d/network" ]; then
- script="$dir/init.d/network"
- elif [ -x "$dir/init.d/networking" ]; then
- script="$dir/init.d/networking"
- fi
- else
- if [ -x "$dir/network" ]; then
- script="$dir/network"
- elif [ -x "$dir/networking" ]; then
- script="$dir/networking"
- fi
- fi
- fi
- done
-
- echo "$script"
-}
-
save_active_NIC_list() {
ifconfig_path=`which ifconfig 2>/dev/null`
if [ $? ]; then
@@ -73,7 +42,7 @@
rescue_NIC() {
niclist="/var/run/vmware-active-nics"
- ifup_path=`which ifup 2>/dev/null`;
+ ifup_path="/etc/init.d/net.";
if [ $? -ne 0 ]; then
return 1;
fi
@@ -90,7 +59,7 @@
else
echo `date` "[rescue_nic] activating $nic ..."
- $ifup_path $nic
+ $ifup_path$nic restart
fi
done < $niclist
@@ -120,7 +89,7 @@
# NetworkManager 0.6
$dbusSend --system --dest=org.freedesktop.NetworkManager \
/org/freedesktop/NetworkManager \
- org.freedesktop.NetworkManager.wake
+ org.freedesktop.NetworkManager.Sleep boolean:false
# NetworkManager 0.7.0
$dbusSend --system --dest=org.freedesktop.NetworkManager \
/org/freedesktop/NetworkManager \
@@ -139,15 +108,8 @@
wakeNetworkManager
-network=`find_networking_script`
-if [ "$network" != "error" ]; then
- "$network" restart
- # Continue even if the networking init script wasn't successful.
- status=0
-else
- echo "networking script not found"
- status=1
-fi
+# Continue even if the networking init script wasn't successful.
+status=0
if [ $status -eq 0 ]; then
rescue_NIC
diff -ur scripts.orig/linux/suspend-vm-default scripts/linux/suspend-vm-default
--- scripts.orig/linux/suspend-vm-default 2009-10-26 14:08:44.000000000 -0400
+++ scripts/linux/suspend-vm-default 2009-10-25 16:27:09.000000000 -0400
@@ -25,37 +25,6 @@
echo `date` ": Executing '$0'"
echo
-find_networking_script() {
- local script="error"
- for dir in "/etc/init.d" "/sbin/init.d" "/etc" "/etc/rc.d" ; do
- if [ -d "$dir/rc0.d" ] &&
- [ -d "$dir/rc1.d" ] &&
- [ -d "$dir/rc2.d" ] &&
- [ -d "$dir/rc3.d" ] &&
- [ -d "$dir/rc4.d" ] &&
- [ -d "$dir/rc5.d" ] &&
- [ -d "$dir/rc6.d" ]; then
-
- # Now find the appropriate networking script.
- if [ -d "$dir/init.d" ]; then
- if [ -x "$dir/init.d/network" ]; then
- script="$dir/init.d/network"
- elif [ -x "$dir/init.d/networking" ]; then
- script="$dir/init.d/networking"
- fi
- else
- if [ -x "$dir/network" ]; then
- script="$dir/network"
- elif [ -x "$dir/networking" ]; then
- script="$dir/networking"
- fi
- fi
- fi
- done
-
- echo "$script"
-}
-
save_active_NIC_list() {
ifconfig_path=`which ifconfig 2>/dev/null`
if [ $? ]; then
@@ -82,11 +51,6 @@
# `which' may be a bit noisy, so we'll shush it.
dbusSend=`which dbus-send 2>/dev/null`
if [ $? -eq 0 ]; then
- # NetworkManager 0.6
- $dbusSend --system --dest=org.freedesktop.NetworkManager \
- /org/freedesktop/NetworkManager \
- org.freedesktop.NetworkManager.sleep
- # NetworkManager 0.7.0
$dbusSend --system --dest=org.freedesktop.NetworkManager \
/org/freedesktop/NetworkManager \
org.freedesktop.NetworkManager.Sleep boolean:true
@@ -107,16 +71,13 @@
save_active_NIC_list
-network=`find_networking_script`
-if [ "$network" != "error" ]; then
- "$network" stop
- # If the network is down, this may fail but that's not a good reason
- # to prevent the suspend.
- status=0
-else
- echo "networking script not found"
- status=1
-fi
+for network in `ls /etc/init.d/net.*`;
+do
+ "$network" stop
+done
+# If the network is down, this may fail but that's not a good reason
+# to prevent the suspend.
+status=0
tranquilizeNetworkManager

View File

@ -1,19 +0,0 @@
Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
Date: 2009-06-12
Initial Package Version: 2009.05.22
Origin: me
Upstream Status: unknown
Description: link against libproc not libproc-2.3.7
diff -Naur open-vm-tools-2009.05.22-167859.orig/configure.ac open-vm-tools-2009.05.22-167859/configure.ac
--- open-vm-tools-2009.05.22-167859.orig/configure.ac 2009-06-12 19:04:42.793906039 +0000
+++ open-vm-tools-2009.05.22-167859/configure.ac 2009-06-12 19:04:55.226773156 +0000
@@ -608,7 +608,7 @@
if test -z "$CUSTOM_PROCPS_LIBS"; then
CUSTOM_PROCPS_LIBS="-L/lib"
fi
- AC_VMW_CHECK_LIB([proc-3.2.7],
+ AC_VMW_CHECK_LIB([proc],
[PROCPS],
[],
[],

View File

@ -1,23 +0,0 @@
--- a/vmware-user/vmware-user.cpp
+++ b/vmware-user/vmware-user.cpp
@@ -529,7 +529,7 @@ VMwareUserRpcInSetOptionCB(char const **
char *value;
unsigned int index = 0;
Bool ret = FALSE;
- char *retStr = NULL;
+ const char *retStr = NULL;
/* parse the option & value string */
option = StrUtil_GetNextToken(&index, args, " ");
--- a/vmware-user/Makefile.am
+++ b/vmware-user/Makefile.am
@@ -75,7 +75,9 @@ vmware_user_LDADD += ../lib/err/libErr.l
vmware_user_LDADD += ../lib/foundryMsg/libFoundryMsg.la
vmware_user_LDADD += ../lib/backdoor/libBackdoor.la
vmware_user_LDADD += ../lib/dict/libDict.la
+if HAVE_GTKMM
vmware_user_LDADD += ../lib/dndGuest/libDndGuest.la
+endif
vmware_user_LDADD += ../lib/dnd/libDnd.la
vmware_user_LDADD += ../lib/dynxdr/libDynxdr.la
vmware_user_LDADD += ../lib/hgfs/libHgfs.la

View File

@ -1,7 +0,0 @@
[Desktop Entry]
Encoding=UTF-8
Type=Application
Exec=vmware-user
Name=VMware User Agent
X-KDE-autostart-phase=1
NoDisplay=true

View File

@ -1,76 +0,0 @@
#!/sbin/runscript
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/files/open-vm-tools.initd,v 1.2 2009/12/20 14:05:43 vadimk Exp $
DND_TMPDIR="/tmp/VMwareDnD"
USER_GROUP="root:vmware"
DND_TMPDIR_PERMS="1777"
GUESTD_BIN="/usr/bin/vmtoolsd"
PIDFILE="/var/run/vmtoolsd.pid"
MOUNTPOINT="/proc/fs/vmblock/mountPoint"
depend() {
before checkfs fsck net X
}
start() {
if [ "${VM_DRAG_AND_DROP}" == "yes" ];
then
if ! grep -q -w vmblock /proc/modules;
then
ebegin "Loading vmblock module"
modprobe vmblock
eend $?
sleep 0.25
fi
if [[ ! -d "${DND_TMPDIR}" ]];
then
# einfo "Creating the VM drag and drop directory"
mkdir "${DND_TMPDIR}"
chown "${USER_GROUP}" "${DND_TMPDIR}"
chmod "${DND_TMPDIR_PERMS}" "${DND_TMPDIR}"
fi
# DnD_TMPDIR must exist before vmblock can be mounted
ebegin "Mounting vmblock device"
mount -t vmblock none ${MOUNTPOINT}
eend $?
fi
ebegin "Starting vmtoolsd"
start-stop-daemon --chuid "${USER_GROUP}" --start --quiet --background --make-pidfile --pidfile "${PIDFILE}" --exec ${GUESTD_BIN}
eend $?
}
stop() {
local ret
if [ "${VM_DRAG_AND_DROP}" == "yes" ];
then
ebegin "Cleaning the contents of ${DND_TMPDIR}"
# First check, whether ${DND_TMPDIR} isn valid... we shouldn't risk deleting the content of ""/*
if [[ ! -z "${DND_TMPDIR}" ]] && [[ "${DND_TMPDIR}" != "/" ]];
then
rm -rf ${DND_TMPDIR}/*
ret=0
else
eerror "Not cleaning up ${DND_TMPDIR}, please check definition of variable"
ret=1
fi
eend $ret
ebegin "Unmounting vmblock device"
if grep -q -w "${MOUNTPOINT}" /proc/mounts;
then
umount ${MOUNTPOINT} 1>&2 > /dev/null
fi
eend 0
fi
ebegin "Stopping vmtoolsd"
start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
eend $?
}

View File

@ -1,2 +0,0 @@
# Set this to no to disable drag and drop (and vmblock) loading.
VM_DRAG_AND_DROP="yes"

View File

@ -1,76 +0,0 @@
#!/sbin/runscript
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/files/open-vm.initd,v 1.2 2008/02/01 12:33:36 flameeyes Exp $
DND_TMPDIR="/tmp/VMwareDnD"
USER_GROUP="root:vmware"
DND_TMPDIR_PERMS="1777"
GUESTD_BIN="/usr/sbin/vmware-guestd"
PIDFILE="/var/run/vmware-guestd.pid"
MOUNTPOINT="/proc/fs/vmblock/mountPoint"
depend() {
before checkfs fsck net X
}
start() {
if [ "${VM_DRAG_AND_DROP}" == "yes" ];
then
if ! grep -q -w vmblock /proc/modules;
then
ebegin "Loading vmblock module"
modprobe vmblock
eend $?
sleep 0.25
fi
if [[ ! -d "${DND_TMPDIR}" ]];
then
# einfo "Creating the VM drag and drop directory"
mkdir "${DND_TMPDIR}"
chown "${USER_GROUP}" "${DND_TMPDIR}"
chmod "${DND_TMPDIR_PERMS}" "${DND_TMPDIR}"
fi
# DnD_TMPDIR must exist before vmblock can be mounted
ebegin "Mounting vmblock device"
mount -t vmblock none ${MOUNTPOINT}
eend $?
fi
ebegin "Starting vmware-guestd"
start-stop-daemon --chuid "${USER_GROUP}" --start --quiet --exec ${GUESTD_BIN} -- --background "${PIDFILE}"
eend $?
}
stop() {
local ret
if [ "${VM_DRAG_AND_DROP}" == "yes" ];
then
ebegin "Cleaning the contents of ${DND_TMPDIR}"
# First check, whether ${DND_TMPDIR} isn valid... we shouldn't risk deleting the content of ""/*
if [[ ! -z "${DND_TMPDIR}" ]] && [[ "${DND_TMPDIR}" != "/" ]];
then
rm -rf ${DND_TMPDIR}/*
ret=0
else
eerror "Not cleaning up ${DND_TMPDIR}, please check definition of variable"
ret=1
fi
eend $ret
ebegin "Unmounting vmblock device"
if grep -q -w "${MOUNTPOINT}" /proc/mounts;
then
umount ${MOUNTPOINT} 1>&2 > /dev/null
fi
eend 0
fi
ebegin "Stopping vmware-guestd"
start-stop-daemon --stop --quiet --pidfile "${PIDFILE}"
eend $?
}

View File

@ -1,2 +0,0 @@
bindir = "/usr/bin"

View File

@ -1,14 +0,0 @@
--- a/lib/wiper/wiperPosix.c
+++ b/lib/wiper/wiperPosix.c
@@ -998,8 +998,9 @@
break;
}
}
- } else {
- fgets(deviceName, sizeof deviceName, fp);
+ } else if (fgets(deviceName, sizeof deviceName, fp) != deviceName) {
+ Warning("%s: Error reading device name from /proc/devices.", __func__);
+ break;
}
}

View File

@ -1,7 +0,0 @@
gnome-panel
ksmserver
startkde
kwrapper
panel
xfce4-panel

View File

@ -1,21 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>vmware</herd>
<maintainer>
<email>vadimk@gentoo.org</email>
</maintainer>
<longdescription>
The Open Virtual Machine Tools (open-vm-tools) are the open source
implementation of VMware Tools. They are a set of guest operating system
virtualization components that enhance performance and user experience
of virtual machines.
</longdescription>
<use>
<flag name='doc'>Generate API documantation</flag>
<flag name='fuse'>Build vmblock-fuse in favor of FUSE based blocking
mechanism for DnD</flag>
<flag name="pic">Force shared libraries to be build as PIC</flag>
<flag name='unity'>Enable host unity support</flag>
</use>
</pkgmetadata>

View File

@ -1,108 +0,0 @@
# 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.3 2009/11/10 16:51:16 vadimk Exp $
EAPI="2"
inherit eutils pam versionator
MY_DATE="$(get_version_component_range 3)"
MY_BUILD="$(get_version_component_range 4)"
MY_PV="${MY_DATE:0:4}.${MY_DATE:4:2}.${MY_DATE:6:2}-${MY_BUILD}"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="Opensourced tools for VMware guests"
HOMEPAGE="http://open-vm-tools.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="X doc fuse icu +pic unity xinerama"
RDEPEND="!app-emulation/open-vm-tools-kmod
app-emulation/open-vm-modules
>=dev-libs/glib-2
dev-libs/libdnet
sys-apps/ethtool
sys-process/procps
virtual/pam
X? (
dev-cpp/gtkmm
x11-base/xorg-server
x11-drivers/xf86-input-vmmouse
x11-drivers/xf86-video-vmware
x11-libs/gtk+
x11-libs/libnotify
x11-libs/libX11
x11-libs/libXtst
)
fuse? ( sys-fs/fuse )
icu? ( dev-libs/icu )
unity? (
dev-libs/uriparser
x11-libs/libXScrnSaver
)
xinerama? ( x11-libs/libXinerama )
"
DEPEND="${RDEPEND}
dev-util/pkgconfig
virtual/linux-sources
doc? ( app-doc/doxygen )
"
S="${WORKDIR}/${MY_P}"
pkg_setup() {
use unity && ! use xinerama && die 'The Unity USE flag requires USE="xinerama" as well'
enewgroup vmware
}
src_prepare() {
epatch "${FILESDIR}/default-scripts1.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"
}
src_configure() {
econf \
--with-procps \
--with-dnet \
--without-kernel-modules \
$(use_with X x) \
$(use_with X gtk2) \
$(use_with X gtkmm) \
$(use_with icu) \
$(use_with pic) \
$(use_enable unity) \
$(use_enable xinerama multimon)
}
src_compile() {
emake || die "failed to compile"
}
src_install() {
emake DESTDIR="${D}" install || die "failed to install"
rm "${D}"/etc/pam.d/vmtoolsd
pamd_mimic_system vmtoolsd auth account
newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools || die "failed to newinitd"
newconfd "${FILESDIR}/open-vm.confd" vmware-tools || die "failed to newconfd"
if use X;
then
insinto /etc/xdg/autostart
doins "${FILESDIR}/open-vm-tools.desktop" || die "failed to install .desktop"
elog "To be able to use the drag'n'drop feature of VMware for file"
elog "exchange, you need to do this:"
elog " Add 'vmware-tools' to your default runlevel."
elog " Add the users which should have access to this function"
elog " to the group 'vmware'."
fi
}

View File

@ -1,111 +0,0 @@
# 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.20091216.217847.ebuild,v 1.1 2009/12/20 14:05:42 vadimk Exp $
EAPI="2"
inherit eutils pam versionator
MY_DATE="$(get_version_component_range 3)"
MY_BUILD="$(get_version_component_range 4)"
MY_PV="${MY_DATE:0:4}.${MY_DATE:4:2}.${MY_DATE:6:2}-${MY_BUILD}"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="Opensourced tools for VMware guests"
HOMEPAGE="http://open-vm-tools.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
LICENSE="LGPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="X doc fuse icu +pic unity xinerama"
RDEPEND="!app-emulation/open-vm-tools-kmod
app-emulation/open-vm-modules
>=dev-libs/glib-2
dev-libs/libdnet
sys-apps/ethtool
sys-process/procps
virtual/pam
X? (
dev-cpp/gtkmm
x11-base/xorg-server
x11-drivers/xf86-input-vmmouse
x11-drivers/xf86-video-vmware
x11-libs/gtk+
x11-libs/libnotify
x11-libs/libX11
x11-libs/libXtst
)
fuse? ( sys-fs/fuse )
icu? ( dev-libs/icu )
unity? (
dev-libs/uriparser
x11-libs/libXScrnSaver
)
xinerama? ( x11-libs/libXinerama )
"
DEPEND="${RDEPEND}
dev-util/pkgconfig
virtual/linux-sources
doc? ( app-doc/doxygen )
"
S="${WORKDIR}/${MY_P}"
pkg_setup() {
use unity && ! use xinerama && die 'The Unity USE flag requires USE="xinerama" as well'
enewgroup vmware
}
src_prepare() {
epatch "${FILESDIR}/default-scripts1.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"
}
src_configure() {
econf \
--with-procps \
--with-dnet \
--without-kernel-modules \
$(use_with X x) \
$(use_with X gtk2) \
$(use_with X gtkmm) \
$(use_with icu) \
$(use_with pic) \
$(use_enable unity) \
$(use_enable xinerama multimon)
}
src_compile() {
emake || die "failed to compile"
}
src_install() {
emake DESTDIR="${D}" install || die "failed to install"
rm "${D}"/etc/pam.d/vmtoolsd
pamd_mimic_system vmtoolsd auth account
rm "${D}"/usr/$(get_libdir)/*.la
rm "${D}"/usr/$(get_libdir)/open-vm-tools/plugins/common/*.la
newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools || die "failed to newinitd"
newconfd "${FILESDIR}/open-vm.confd" vmware-tools || die "failed to newconfd"
if use X;
then
insinto /etc/xdg/autostart
doins "${FILESDIR}/open-vm-tools.desktop" || die "failed to install .desktop"
elog "To be able to use the drag'n'drop feature of VMware for file"
elog "exchange, you need to do this:"
elog " Add 'vmware-tools' to your default runlevel."
elog " Add the users which should have access to this function"
elog " to the group 'vmware'."
fi
}

View File

@ -43,6 +43,30 @@ AUX 0.12.4/0013-i386-linux-user-NPTL-support.patch 2097 RMD160 c0894f7a112c5ad4f
AUX 0.12.4/0014-qemu-0.11-git-ioctl_mount.patch 893 RMD160 b0dbf5ff9912905dc3a536189f1ca9ee621bccb8 SHA1 b1cdcc0c00cae4ede9fa76ad99103324a408b273 SHA256 8523965fb8781e35f5c6852b72c1f80c3fba859bf600075e11b71d2a4ce719ab
AUX 0.12.4/0015-qemu-0.11-git-user-linux-ppc-uid16_fix.patch 4886 RMD160 f054c87a28c786687f14a9d7936d29c5f4ebf923 SHA1 e5a8e5ce368eec9da5069ff45cecf7826d71fccd SHA256 198bb2e440d5ac53cf065b7eb634528d0725b3c66fd5be3306046bf4994e9e59
AUX 0.12.4/0016-S-390-support.patch 248902 RMD160 a8691de62f77db5a1764adbe82e50de47ac1b8a3 SHA1 f7cf8c6c0bdfead8d2ad73ce6a49b6586ded1743 SHA256 c951f19784d126230ac563ad0c9ebb9ad96b6260f5ac53e43dc469e374f635f1
AUX 0.14.1/0001-qemu-0.7.0-amd64.patch 1475 RMD160 a1997077c9463e209b6717ec0e305f171282697d SHA1 befe5ae85f37e4ceaa15b8b701e26628685db7cc SHA256 25bda27f693ebb127d442205f46233318c1ea0c25e83494b3be077ceb01be509
AUX 0.14.1/0002-qemu-0.9.0.cvs-binfmt.patch 8802 RMD160 d46805c0b265554e5073fffa50b807efe810aa6a SHA1 5e46438cd3d98e9c7da7da317b8a59d8092721c3 SHA256 ea60680268c2fa9ff1df3bb2ed823a27967193874750b29d35e417e2a639b2dc
AUX 0.14.1/0003-qemu-cvs-alsa_bitfield.patch 2461 RMD160 fbd6ca8650925404fb7031cc248e687e1f785650 SHA1 6599dda02adf122c0553e167d08d347f9105d8bf SHA256 5742477cb0aaf129fd120dee2adae795fe3ba4e6377b5e384159028faf42f625
AUX 0.14.1/0004-qemu-cvs-alsa_ioctl.patch 134017 RMD160 bb5370db468a32695ef0f3d95c2324ff9642cee7 SHA1 fed07226b62ab12ee896f0e1d8f5dfa87804f721 SHA256 e710e46e56e340978d1ff9bff2c41dc8a6cdb6b1a27ad24aecf955cdc636b1f7
AUX 0.14.1/0005-qemu-cvs-alsa_mmap.patch 1542 RMD160 c0b59c8585be031a4311944abf39458094783734 SHA1 7d3eac48e1ee92b5f01ec15fe89ec96357e2f5af SHA256 063c61a3cbd3d1fab92b340973754c7a3ee16653bfe7c603b5ff3f8b5f81a692
AUX 0.14.1/0006-qemu-cvs-gettimeofday.patch 823 RMD160 16b15186f494c5b494f573d4304be6b3afe05213 SHA1 ce9932091b1192abbe6bbf5f4fb820c0d84a53f4 SHA256 0cbf3f7ef72e70633f1e10b453a8a5beafba5864a3c04ab89c211be5333685c8
AUX 0.14.1/0007-qemu-cvs-ioctl_debug.patch 1432 RMD160 60e8a34301c7901ec6cc0c658243ad3f0e7d54e0 SHA1 46639e9baec2f6478941787aeab969123541d050 SHA256 fb6eeef6d5011fddb781da97dd05437ea46ac71a98c1d98a2a7567c79e8bcbe8
AUX 0.14.1/0008-qemu-cvs-ioctl_nodirection.patch 1601 RMD160 d526d6ef7388870f3397c99878cc16367ead6c4d SHA1 6c233ea2d992fd11d4e3e6cf647a533d20e18a2e SHA256 05f7a3c3f041adbf1161291ba5df330863910b0fc2eb998d66a9ae461c023f44
AUX 0.14.1/0009-qemu-cvs-sched_getaffinity.patch 1930 RMD160 f35786262802559ee3b74c7973ace7729ab86a9a SHA1 65e42415dc3fd078469ccf7e8cd03f484a3c6270 SHA256 0c7e4ed35b0b448cab3021a9903d5fbb7fa78e4aafd7df034baeeaf151827cc4
AUX 0.14.1/0010-qemu-cvs-mmap-amd64.patch 3054 RMD160 63da0f1fc63c8a20c30a653a98c36157cff64c39 SHA1 796316da61db32ba75a26581256d9b4d5bfe1993 SHA256 e40ecfef55a57446936c76aa3a9c677c5e0e76bebf07faeaf50b2bab7450f424
AUX 0.14.1/0011-qemu-img-vmdk-scsi.patch 4202 RMD160 0c9b9e6a166655414f9d43ae5483fc71166057c2 SHA1 8bb2bc3da9db327ba56e48542bf07feffca19384 SHA256 bef274ebc2ee4221ba3e7ee4ba226e7e6205050d9a5fb2e4dbb84b71671a2494
AUX 0.14.1/0012-qemu-nonvoid_return.patch 1123 RMD160 5d77c2943d6e8e6e34b65e22566310a7d1cfa80e SHA1 319268438cd6ab68d35ff5bd4ef9ec279f488910 SHA256 0e4ac0b693052be9a358e66d36a9eb18f447c7309cfe57e602d13ae643f1ea3a
AUX 0.14.1/0013-i386-linux-user-NPTL-support.patch 2095 RMD160 db559b9b6540e21ef421a7187421687ce4bc4a92 SHA1 e072aac495c5df51f08efcd8b6073f1a62f37b14 SHA256 c4d367c3f564d4b51de2bb1960871caa4c05f783787df24d97cbd975539b166c
AUX 0.14.1/0015-S-390-support.patch 218653 RMD160 a6c71703b596b5dcb89a85e3666e4fde45b6bb69 SHA1 da575d8118e8190e524e4c38c56ca9d8670ba85f SHA256 1d89403a6cffa8a92f96c0b6a17214a618acd7cde5abf51ed10c11c659de5b64
AUX 0.14.1/0016-fix-mipsn32-linux-user-builds.patch 1919 RMD160 45b3251fd74a078ea7f85d4253cd8f2577d152d3 SHA1 7ac33b6cd89283cec9357bdf34d7ff730a6e3537 SHA256 1b75963bfe30ffa6525ef4e14b635ac2997813e86027f4e7abd999be417af3f1
AUX 0.14.1/0017-S-390-build-fix.patch 5784 RMD160 33604e52784141eefc1ee6c77e544b8e64edfcc6 SHA1 1bb2fd027c740cc0475289476bab0f9daa9158e8 SHA256 e90790afa0711b153ab3e0fd5a68052d4016499d8a6c6110eb25f7e0701fc9de
AUX 0.14.1/0018-qemu-0.14.1-mcast-udp.patch 10214 RMD160 1f8e767837a312d5ce912dad9551214d73b5e45b SHA1 c1fff0c9b7e60fd611973ddf9acb717e8edfa202 SHA256 182c72d1c2056ac7c5dafbb469dce58844e964949b2c9cbdb7d33edd1aca7567
AUX 0.14.1/0019-linux-user-fix-openat.patch 1675 RMD160 6b28cb0e0b0e27e992e830994a0ed3f7e4a55497 SHA1 da19a1f0586850bc6655195a5c5e14366aac882c SHA256 8c753f00bd09594fb92625f029a6b2b04b6134b8132b8fdd753a4f835cd41582
AUX 0.14.1/0020-linux-user-implement-reboot-syscall.patch 1403 RMD160 456a111c9681cb0d9c512c2865a3c213166533c7 SHA1 9c996094f1abbb5aae709eece617b3bfc86ca6d1 SHA256 7696d2ce0d3e311716aed420e11323d2ef83b93d7e82fac992361c3ca7d8e32b
AUX 0.14.1/0021-implement-prlimit64-syscall.patch 4175 RMD160 c31cd2e670c0fe3a8b2df462b1fb4b1e7c55cb9b SHA1 1bf72cfe09bb4bfb5101cd96fdade15bfe538926 SHA256 79d7e395b46430775f8f82b19890d2f73681d9fdfac46b807b3d148e83facf91
AUX 0.14.1/0022-fixing-smp-races.patch 1224 RMD160 bcb627e31d677dd787c252d40da3faf45742e4bf SHA1 0b92b6b92eb8ebe92b465e0c5266ef74cf52e917 SHA256 cbb12a0cee1a123fc209b563968ee0c8b2111727adbf8b00644a24f23fbbce15
AUX 0.14.1/0023-linux-user-add-binfmt-wrapper-for-argv-0-handling.patch 11904 RMD160 0165cdaf6a7307838993285f95c228d005ade149 SHA1 04d8c700314decb3759d530c27b5ba72d8c1c4d9 SHA256 cc2340c63ec2a216bc5d460d7419bf84f3869015fcfd73096530b43ce357ab45
AUX 0.14.1/0024-fix-glibc-install-locales.patch 17811 RMD160 563366d547aeec28faf2602c48c09eaafbb44381 SHA1 ac8585ee6b334969fb79a6fd4844e8a415b6c717 SHA256 2a18ba91c190dc457fe1683af23d9b7814eee1ed5ba44362187756706d26c99c
AUX 0.14.1/0025-add-syscall-numbers-from-2.6.39.2.patch 17282 RMD160 8d5ff85efb34788680125a878495d86ec8c6f0d6 SHA1 7ee7fa50a7b7e862bff0c0221080349bc03d710f SHA256 c61c5fc6e9e849bb14548e5f80ec5abcf52c92b78d9c079a359d9d4b0cb55f1d
AUX qemu-0.10.3-nopl-fix.patch 1118 RMD160 849e4b88ca7985dc3faae0a225181205043f0265 SHA1 70cf0727a7cbdd79243ae6768f34c07c6e9c5aec SHA256 24656137f1f38aed2c2661ebd20d9a6d86eaf9768c3e239b971f01418b396028
AUX qemu-0.11.0-mips64-user-fix.patch 313 RMD160 db016e0a48990a435dd6cf6e807145b33ada4908 SHA1 2ea913b1bcd29734a6d4011794bdb4aa3599a184 SHA256 b4173fc177bd0d0ba67f5551a3512047a19a9b2c0a122f968e32fbd834848d2f
AUX qemu-arm-eabi-0.10.5.patch 21422 RMD160 a2ab6384938b08764324a4239fc30718161a3977 SHA1 2c7cec113b02e9f91226887257b393a3dfba2234 SHA256 b47327d7eab124617941e5403c5d4d0af2b21ce2278d5524677c521be462aa57

View File

@ -0,0 +1,34 @@
From 4af9300d36f0975213b0fb967131629ad6b4c550 Mon Sep 17 00:00:00 2001
From: Ulrich Hecht <uli@suse.de>
Date: Tue, 14 Apr 2009 16:17:39 +0200
Subject: [PATCH 01/17] qemu-0.7.0-amd64
No clue why this is necessary or useful, nothing found in any changelogs.
---
x86_64.ld | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
Index: qemu-0.14.1/x86_64.ld
===================================================================
--- qemu-0.14.1.orig/x86_64.ld
+++ qemu-0.14.1/x86_64.ld
@@ -70,8 +70,6 @@ SECTIONS
.rodata : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
.rodata1 : { *(.rodata1) }
.eh_frame_hdr : { *(.eh_frame_hdr) }
- .eh_frame : ONLY_IF_RO { KEEP (*(.eh_frame)) }
- .gcc_except_table : ONLY_IF_RO { *(.gcc_except_table) }
/* Adjust the address for the data segment. We want to adjust up to
the same address within the page on the next page up. */
. = ALIGN (0x100000) - ((0x100000 - .) & (0x100000 - 1)); . = DATA_SEGMENT_ALIGN (0x100000, 0x1000);
@@ -97,8 +95,8 @@ SECTIONS
.data1 : { *(.data1) }
.tdata : { *(.tdata .tdata.* .gnu.linkonce.td.*) }
.tbss : { *(.tbss .tbss.* .gnu.linkonce.tb.*) *(.tcommon) }
- .eh_frame : ONLY_IF_RW { KEEP (*(.eh_frame)) }
- .gcc_except_table : ONLY_IF_RW { *(.gcc_except_table) }
+ .eh_frame : { KEEP (*(.eh_frame)) }
+ .gcc_except_table : { *(.gcc_except_table) }
.dynamic : { *(.dynamic) }
.ctors :
{

View File

@ -0,0 +1,82 @@
From 8f16efecc00d3ee4615dcd2d5381b23df4465698 Mon Sep 17 00:00:00 2001
From: Ulrich Hecht <uli@suse.de>
Date: Tue, 14 Apr 2009 16:18:44 +0200
Subject: [PATCH 02/17] qemu-0.9.0.cvs-binfmt
Fixes binfmt_misc setup script:
- x86_64 is i386-compatible
- m68k signature fixed
- path to QEMU
Signed-off-by: Ulrich Hecht <uli@suse.de>
---
scripts/qemu-binfmt-conf.sh | 35 +++++++++++++++++++----------------
1 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
index c50beb7..335ab05 100644
--- a/scripts/qemu-binfmt-conf.sh
+++ b/scripts/qemu-binfmt-conf.sh
@@ -27,40 +27,43 @@ case "$cpu" in
armv[4-9]*)
cpu="arm"
;;
+ sparc*)
+ cpu="sparc"
+ ;;
esac
# register the interpreter for each cpu except for the native one
if [ $cpu != "i386" ] ; then
- echo ':i386:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/local/bin/qemu-i386:' > /proc/sys/fs/binfmt_misc/register
- echo ':i486:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/local/bin/qemu-i386:' > /proc/sys/fs/binfmt_misc/register
+ echo ':i386:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386:' > /proc/sys/fs/binfmt_misc/register
+ echo ':i486:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386:' > /proc/sys/fs/binfmt_misc/register
fi
if [ $cpu != "alpha" ] ; then
- echo ':alpha:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/local/bin/qemu-alpha:' > /proc/sys/fs/binfmt_misc/register
+ echo ':alpha:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-alpha:' > /proc/sys/fs/binfmt_misc/register
fi
if [ $cpu != "arm" ] ; then
- echo ':arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/local/bin/qemu-arm:' > /proc/sys/fs/binfmt_misc/register
- echo ':armeb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-armeb:' > /proc/sys/fs/binfmt_misc/register
+ echo ':arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm:' > /proc/sys/fs/binfmt_misc/register
+ echo ':armeb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-armeb:' > /proc/sys/fs/binfmt_misc/register
fi
if [ $cpu != "sparc" ] ; then
- echo ':sparc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-sparc:' > /proc/sys/fs/binfmt_misc/register
+ echo ':sparc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc:' > /proc/sys/fs/binfmt_misc/register
fi
if [ $cpu != "ppc" ] ; then
- echo ':ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-ppc:' > /proc/sys/fs/binfmt_misc/register
+ echo ':ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc:' > /proc/sys/fs/binfmt_misc/register
fi
if [ $cpu != "m68k" ] ; then
echo 'Please check cpu value and header information for m68k!'
- echo ':m68k:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x04:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-m68k:' > /proc/sys/fs/binfmt_misc/register
+ echo ':m68k:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-m68k:' > /proc/sys/fs/binfmt_misc/register
fi
if [ $cpu != "mips" ] ; then
# FIXME: We could use the other endianness on a MIPS host.
- echo ':mips:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-mips:' > /proc/sys/fs/binfmt_misc/register
- echo ':mipsel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/local/bin/qemu-mipsel:' > /proc/sys/fs/binfmt_misc/register
- echo ':mipsn32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-mipsn32:' > /proc/sys/fs/binfmt_misc/register
- echo ':mipsn32el:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/local/bin/qemu-mipsn32el:' > /proc/sys/fs/binfmt_misc/register
- echo ':mips64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-mips64:' > /proc/sys/fs/binfmt_misc/register
- echo ':mips64el:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/local/bin/qemu-mips64el:' > /proc/sys/fs/binfmt_misc/register
+ echo ':mips:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips:' > /proc/sys/fs/binfmt_misc/register
+ echo ':mipsel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsel:' > /proc/sys/fs/binfmt_misc/register
+ echo ':mipsn32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mipsn32:' > /proc/sys/fs/binfmt_misc/register
+ echo ':mipsn32el:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsn32el:' > /proc/sys/fs/binfmt_misc/register
+ echo ':mips64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips64:' > /proc/sys/fs/binfmt_misc/register
+ echo ':mips64el:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mips64el:' > /proc/sys/fs/binfmt_misc/register
fi
if [ $cpu != "sh" ] ; then
- echo ':sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/local/bin/qemu-sh4:' > /proc/sys/fs/binfmt_misc/register
- echo ':sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/local/bin/qemu-sh4eb:' > /proc/sys/fs/binfmt_misc/register
+ echo ':sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-sh4:' > /proc/sys/fs/binfmt_misc/register
+ echo ':sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sh4eb:' > /proc/sys/fs/binfmt_misc/register
fi
--
1.7.1

View File

@ -0,0 +1,83 @@
From 8a88b86cc9a3ad0bb6da52fb0f938fe5a085c027 Mon Sep 17 00:00:00 2001
From: Ulrich Hecht <uli@suse.de>
Date: Tue, 14 Apr 2009 16:20:50 +0200
Subject: [PATCH 03/17] qemu-cvs-alsa_bitfield
Implements TYPE_INTBITFIELD partially. (required for ALSA support)
Signed-off-by: Ulrich Hecht <uli@suse.de>
---
thunk.c | 21 +++++++++++++++++++++
thunk.h | 3 +++
2 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/thunk.c b/thunk.c
index 0657188..5638b2c 100644
--- a/thunk.c
+++ b/thunk.c
@@ -41,6 +41,7 @@ static inline const argtype *thunk_type_next(const argtype *type_ptr)
case TYPE_CHAR:
case TYPE_SHORT:
case TYPE_INT:
+ case TYPE_INTBITFIELD:
case TYPE_LONGLONG:
case TYPE_ULONGLONG:
case TYPE_LONG:
@@ -139,6 +140,26 @@ const argtype *thunk_convert(void *dst, const void *src,
case TYPE_INT:
*(uint32_t *)dst = tswap32(*(uint32_t *)src);
break;
+ case TYPE_INTBITFIELD:
+#if defined(TARGET_I386) && defined(__powerpc__)
+ /* powerpc uses the MSB, whereas i386 uses the LSB
+ * to store the first bit in a field */
+ {
+ unsigned char byte = *(uint8_t *)src;
+ *(uint8_t *)dst = ((byte >> 7) & 1)
+ | ((byte >> 5) & 2)
+ | ((byte >> 3) & 4)
+ | ((byte >> 1) & 8)
+ | ((byte << 1) & 16)
+ | ((byte << 3) & 32)
+ | ((byte << 5) & 64)
+ | ((byte << 7) & 128);
+ /* FIXME: implement for bitfields > 1 byte and other archs */
+ }
+#else
+ *(uint32_t *)dst = tswap32(*(uint32_t *)src);
+#endif
+ break;
case TYPE_LONGLONG:
case TYPE_ULONGLONG:
*(uint64_t *)dst = tswap64(*(uint64_t *)src);
diff --git a/thunk.h b/thunk.h
index 109c541..55890f3 100644
--- a/thunk.h
+++ b/thunk.h
@@ -37,6 +37,7 @@ typedef enum argtype {
TYPE_PTR,
TYPE_ARRAY,
TYPE_STRUCT,
+ TYPE_INTBITFIELD,
} argtype;
#define MK_PTR(type) TYPE_PTR, type
@@ -90,6 +91,7 @@ static inline int thunk_type_size(const argtype *type_ptr, int is_host)
case TYPE_SHORT:
return 2;
case TYPE_INT:
+ case TYPE_INTBITFIELD:
return 4;
case TYPE_LONGLONG:
case TYPE_ULONGLONG:
@@ -127,6 +129,7 @@ static inline int thunk_type_align(const argtype *type_ptr, int is_host)
case TYPE_SHORT:
return 2;
case TYPE_INT:
+ case TYPE_INTBITFIELD:
return 4;
case TYPE_LONGLONG:
case TYPE_ULONGLONG:
--
1.7.1

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,47 @@
From 3848cba4ed22ebef70e59cbb542e71a37fe74d1d Mon Sep 17 00:00:00 2001
From: Ulrich Hecht <uli@suse.de>
Date: Tue, 14 Apr 2009 16:24:15 +0200
Subject: [PATCH 05/17] qemu-cvs-alsa_mmap
Hack to prevent ALSA from using mmap() interface to simplify emulation.
Signed-off-by: Ulrich Hecht <uli@suse.de>
---
linux-user/mmap.c | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index abf21f6..e18c228 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -360,6 +360,9 @@ abi_ulong mmap_find_vma(abi_ulong start, abi_ulong size)
}
}
+#define SNDRV_PCM_MMAP_OFFSET_STATUS 0x80000000
+#define SNDRV_PCM_MMAP_OFFSET_CONTROL 0x81000000
+
/* NOTE: all the constants are the HOST ones */
abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
int flags, int fd, abi_ulong offset)
@@ -395,6 +398,17 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
}
#endif
+ /* Alsa tries to communcate with the kernel via mmap. This usually
+ * is a good idea when user- and kernelspace are running on the
+ * same architecture but does not work out when not. To make alsa
+ * not to use mmap, we can just have it fail on the mmap calls that
+ * would initiate this.
+ */
+ if(offset == SNDRV_PCM_MMAP_OFFSET_STATUS || offset == SNDRV_PCM_MMAP_OFFSET_CONTROL) {
+ errno = EINVAL;
+ return -1;
+ }
+
if (offset & ~TARGET_PAGE_MASK) {
errno = EINVAL;
goto fail;
--
1.7.1

View File

@ -0,0 +1,26 @@
From da6cdca6cdbfccb4936f5df5e297a87fe1e4baa8 Mon Sep 17 00:00:00 2001
From: Ulrich Hecht <uli@suse.de>
Date: Tue, 14 Apr 2009 16:25:41 +0200
Subject: [PATCH 06/17] qemu-cvs-gettimeofday
No clue what this is for.
---
linux-user/syscall.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 499c4d7..92f2aa6 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -5399,6 +5399,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
case TARGET_NR_gettimeofday:
{
struct timeval tv;
+ if(copy_from_user_timeval(&tv, arg1))
+ goto efault;
ret = get_errno(gettimeofday(&tv, NULL));
if (!is_error(ret)) {
if (copy_to_user_timeval(arg1, &tv))
--
1.7.1

View File

@ -0,0 +1,33 @@
From 1a883714ac7e953bab2bbdeba651d0696f49dd81 Mon Sep 17 00:00:00 2001
From: Ulrich Hecht <uli@suse.de>
Date: Tue, 14 Apr 2009 16:26:33 +0200
Subject: [PATCH 07/17] qemu-cvs-ioctl_debug
Extends unsupported ioctl debug output.
Signed-off-by: Ulrich Hecht <uli@suse.de>
---
linux-user/syscall.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 92f2aa6..04f77ef 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -3100,7 +3100,12 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg)
ie = ioctl_entries;
for(;;) {
if (ie->target_cmd == 0) {
- gemu_log("Unsupported ioctl: cmd=0x%04lx\n", (long)cmd);
+ int i;
+ gemu_log("Unsupported ioctl: cmd=0x%04lx (%x)\n", (unsigned long)cmd, (unsigned int)(cmd & (TARGET_IOC_SIZEMASK << TARGET_IOC_SIZESHIFT)) >> TARGET_IOC_SIZESHIFT);
+ for(i=0;ioctl_entries[i].target_cmd;i++) {
+ if((ioctl_entries[i].target_cmd & ~(TARGET_IOC_SIZEMASK << TARGET_IOC_SIZESHIFT)) == (cmd & ~(TARGET_IOC_SIZEMASK << TARGET_IOC_SIZESHIFT)))
+ gemu_log("%p\t->\t%s (%x)\n", (void *)(unsigned long)ioctl_entries[i].host_cmd, ioctl_entries[i].name, (ioctl_entries[i].target_cmd & (TARGET_IOC_SIZEMASK << TARGET_IOC_SIZESHIFT)) >> TARGET_IOC_SIZESHIFT);
+ }
return -TARGET_ENOSYS;
}
if (ie->target_cmd == cmd)
--
1.7.1

View File

@ -0,0 +1,42 @@
From d03d586aabc9000cabc56de7e327c5b5640f3179 Mon Sep 17 00:00:00 2001
From: Ulrich Hecht <uli@suse.de>
Date: Tue, 14 Apr 2009 16:27:36 +0200
Subject: [PATCH 08/17] qemu-cvs-ioctl_nodirection
the direction given in the ioctl should be correct so we can assume the
communication is uni-directional. The alsa developers did not like this
concept though and declared ioctls IOC_R and IOC_W even though they were
IOC_RW.
Signed-off-by: Ulrich Hecht <uli@suse.de>
---
linux-user/syscall.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 04f77ef..b51634b 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -3134,6 +3134,11 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg)
arg_type++;
target_size = thunk_type_size(arg_type, 0);
switch(ie->access) {
+ /* FIXME: actually the direction given in the ioctl should be
+ * correct so we can assume the communication is uni-directional.
+ * The alsa developers did not like this concept though and
+ * declared ioctls IOC_R and IOC_W even though they were IOC_RW.*/
+/*
case IOC_R:
ret = get_errno(ioctl(fd, ie->host_cmd, buf_temp));
if (!is_error(ret)) {
@@ -3152,6 +3157,7 @@ static abi_long do_ioctl(int fd, abi_long cmd, abi_long arg)
unlock_user(argptr, arg, 0);
ret = get_errno(ioctl(fd, ie->host_cmd, buf_temp));
break;
+*/
default:
case IOC_RW:
argptr = lock_user(VERIFY_READ, arg, target_size, 1);
--
1.7.1

View File

@ -0,0 +1,56 @@
From 026ee1029cfeb6c802ee715372992fb3c847bd27 Mon Sep 17 00:00:00 2001
From: Ulrich Hecht <uli@suse.de>
Date: Tue, 14 Apr 2009 16:30:16 +0200
Subject: [PATCH 09/17] qemu-cvs-sched_getaffinity
Implements sched_getaffinity syscall.
Signed-off-by: Ulrich Hecht <uli@suse.de>
---
linux-user/syscall.c | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index b51634b..81bf1f0 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -164,6 +164,7 @@ static type name (type1 arg1,type2 arg2,type3 arg3,type4 arg4,type5 arg5, \
}
+#define __NR_sys_sched_getaffinity __NR_sched_getaffinity
#define __NR_sys_uname __NR_uname
#define __NR_sys_faccessat __NR_faccessat
#define __NR_sys_fchmodat __NR_fchmodat
@@ -223,6 +224,9 @@ _syscall3(int,sys_tgkill,int,tgid,int,pid,int,sig)
#if defined(TARGET_NR_tkill) && defined(__NR_tkill)
_syscall2(int,sys_tkill,int,tid,int,sig)
#endif
+#ifdef __NR_sys_sched_getaffinity
+_syscall3(int,sys_sched_getaffinity,pid_t,pid,unsigned int,cpusetsize,void*,mask)
+#endif
#ifdef __NR_exit_group
_syscall1(int,exit_group,int,error_code)
#endif
@@ -7505,6 +7509,18 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
break;
#endif
#endif
+
+#ifdef TARGET_NR_sched_getaffinity
+ case TARGET_NR_sched_getaffinity:
+ {
+ cpu_set_t *mask;
+ lock_user_struct(VERIFY_READ, mask, arg3, 1);
+ ret = get_errno(sys_sched_getaffinity((pid_t)arg1, (unsigned int)arg2, mask));
+ unlock_user_struct(mask, arg3, 0);
+ break;
+ }
+#endif
+
default:
unimplemented:
gemu_log("qemu: Unsupported syscall: %d\n", num);
--
1.7.1

View File

@ -0,0 +1,74 @@
From: Alexander Graf <agraf@suse.de>
When executing 32-bit guest binaries on 64-bit hosts, mmap() can return
a 64-bit pointer. Tell mmap() to always map in 32-bit address space, so
we make 32-bit guest applications happy.
This is a hack and should not go upstream in its current form!
Signed-off-by: Alexander Graf <agraf@suse.de>
---
linux-user/mmap.c | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/linux-user/mmap.c b/linux-user/mmap.c
index 994c02b..e24b63a 100644
--- a/linux-user/mmap.c
+++ b/linux-user/mmap.c
@@ -169,7 +169,7 @@ static int mmap_frag(abi_ulong real_start,
if (prot1 == 0) {
/* no page was there, so we allocate one */
void *p = mmap(host_start, qemu_host_page_size, prot,
- flags | MAP_ANONYMOUS, -1, 0);
+ flags | MAP_ANONYMOUS | MAP_32BIT, -1, 0);
if (p == MAP_FAILED)
return -1;
prot1 = prot;
@@ -292,7 +292,7 @@ abi_ulong mmap_find_vma(abi_ulong start, abi_ulong size)
* - shmat() with SHM_REMAP flag
*/
ptr = mmap(g2h(addr), size, PROT_NONE,
- MAP_ANONYMOUS|MAP_PRIVATE|MAP_NORESERVE, -1, 0);
+ MAP_ANONYMOUS|MAP_PRIVATE|MAP_NORESERVE|MAP_32BIT, -1, 0);
/* ENOMEM, if host address space has no memory */
if (ptr == MAP_FAILED) {
@@ -454,14 +454,14 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
especially important if qemu_host_page_size >
qemu_real_host_page_size */
p = mmap(g2h(mmap_start),
- host_len, prot, flags | MAP_FIXED | MAP_ANONYMOUS, -1, 0);
+ host_len, prot, flags | MAP_FIXED | MAP_ANONYMOUS | MAP_32BIT, -1, 0);
if (p == MAP_FAILED)
goto fail;
/* update start so that it points to the file position at 'offset' */
host_start = (unsigned long)p;
if (!(flags & MAP_ANONYMOUS)) {
p = mmap(g2h(mmap_start), len, prot,
- flags | MAP_FIXED, fd, host_offset);
+ flags | MAP_FIXED | MAP_32BIT, fd, host_offset);
host_start += offset - host_offset;
}
start = h2g(host_start);
@@ -547,7 +547,7 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot,
else
offset1 = offset + real_start - start;
p = mmap(g2h(real_start), real_end - real_start,
- prot, flags, fd, offset1);
+ prot, flags | MAP_32BIT, fd, offset1);
if (p == MAP_FAILED)
goto fail;
}
@@ -603,7 +603,7 @@ static void mmap_reserve(abi_ulong start, abi_ulong size)
}
if (real_start != real_end) {
mmap(g2h(real_start), real_end - real_start, PROT_NONE,
- MAP_FIXED | MAP_ANONYMOUS | MAP_PRIVATE | MAP_NORESERVE,
+ MAP_FIXED | MAP_ANONYMOUS | MAP_PRIVATE | MAP_NORESERVE | MAP_32BIT,
-1, 0);
}
}
--
1.6.0.2

View File

@ -0,0 +1,116 @@
From 09686f619707ec98e073bf671b0334a2f65934ad Mon Sep 17 00:00:00 2001
From: Ulrich Hecht <uli@suse.de>
Date: Tue, 14 Apr 2009 16:37:42 +0200
Subject: [PATCH 11/17] qemu-img-vmdk-scsi
Support creation of SCSI VMDK images in qemu-img.
Signed-off-by: Ulrich Hecht <uli@suse.de>
---
block.c | 5 ++++-
block/vmdk.c | 7 +++++--
block_int.h | 2 ++
qemu-img.c | 8 +++++++-
4 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/block.c b/block.c
index b476479..b77f09b 100644
--- a/block.c
+++ b/block.c
@@ -2792,7 +2792,7 @@ int bdrv_img_create(const char *filename, const char *fmt,
char *options, uint64_t img_size, int flags)
{
QEMUOptionParameter *param = NULL, *create_options = NULL;
- QEMUOptionParameter *backing_fmt, *backing_file;
+ QEMUOptionParameter *backing_fmt, *backing_file, *scsi;
BlockDriverState *bs = NULL;
BlockDriver *drv, *proto_drv;
BlockDriver *backing_drv = NULL;
@@ -2901,6 +2901,9 @@ int bdrv_img_create(const char *filename, const char *fmt,
printf("Formatting '%s', fmt=%s ", filename, fmt);
print_option_parameters(param);
+ scsi = get_option_parameter(param, BLOCK_OPT_SCSI);
+ if (scsi && scsi->value.n)
+ printf(", SCSI");
puts("");
ret = bdrv_create(drv, filename, param);
diff --git a/block/vmdk.c b/block/vmdk.c
index 8fc9d67..8944173 100644
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -685,7 +685,7 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options)
"ddb.geometry.cylinders = \"%" PRId64 "\"\n"
"ddb.geometry.heads = \"16\"\n"
"ddb.geometry.sectors = \"63\"\n"
- "ddb.adapterType = \"ide\"\n";
+ "ddb.adapterType = \"%s\"\n";
char desc[1024];
const char *real_filename, *temp_str;
int64_t total_size = 0;
@@ -701,6 +701,8 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options)
backing_file = options->value.s;
} else if (!strcmp(options->name, BLOCK_OPT_COMPAT6)) {
flags |= options->value.n ? BLOCK_FLAG_COMPAT6: 0;
+ } else if (!strcmp(options->name, BLOCK_OPT_SCSI)) {
+ flags |= options->value.n ? BLOCK_FLAG_SCSI: 0;
}
options++;
}
@@ -798,7 +800,8 @@ static int vmdk_create(const char *filename, QEMUOptionParameter *options)
snprintf(desc, sizeof(desc), desc_template, (unsigned int)time(NULL),
total_size, real_filename,
(flags & BLOCK_FLAG_COMPAT6 ? 6 : 4),
- total_size / (int64_t)(63 * 16));
+ total_size / (int64_t)(63 * 16),
+ flags & BLOCK_FLAG_SCSI ? "lsilogic" : "ide");
/* write the descriptor */
lseek(fd, le64_to_cpu(header.desc_offset) << 9, SEEK_SET);
diff --git a/block_int.h b/block_int.h
index 545ad11..771fd91 100644
--- a/block_int.h
+++ b/block_int.h
@@ -30,10 +30,12 @@
#define BLOCK_FLAG_ENCRYPT 1
#define BLOCK_FLAG_COMPAT6 4
+#define BLOCK_FLAG_SCSI 8
#define BLOCK_OPT_SIZE "size"
#define BLOCK_OPT_ENCRYPT "encryption"
#define BLOCK_OPT_COMPAT6 "compat6"
+#define BLOCK_OPT_SCSI "scsi"
#define BLOCK_OPT_BACKING_FILE "backing_file"
#define BLOCK_OPT_BACKING_FMT "backing_fmt"
#define BLOCK_OPT_CLUSTER_SIZE "cluster_size"
diff --git a/qemu-img.c b/qemu-img.c
index 4a37358..ed8cc08 100644
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -572,7 +572,7 @@ static int img_convert(int argc, char **argv)
const uint8_t *buf1;
BlockDriverInfo bdi;
QEMUOptionParameter *param = NULL, *create_options = NULL;
- QEMUOptionParameter *out_baseimg_param;
+ QEMUOptionParameter *out_baseimg_param, *scsi;
char *options = NULL;
const char *snapshot_name = NULL;
@@ -727,6 +727,12 @@ static int img_convert(int argc, char **argv)
}
}
+ if ((scsi = get_option_parameter(param, BLOCK_OPT_SCSI)) && scsi->value.n && strcmp(drv->format_name, "vmdk")) {
+ error_report("SCSI devices not supported for this file format");
+ ret = -1;
+ goto out;
+ }
+
/* Create the new image */
ret = bdrv_create(drv, out_filename, param);
if (ret < 0) {
--
1.7.1

View File

@ -0,0 +1,40 @@
From 75c51f45c127ebe4f549041aae98f510480429ae Mon Sep 17 00:00:00 2001
From: Ulrich Hecht <uli@suse.de>
Date: Tue, 14 Apr 2009 16:38:20 +0200
Subject: [PATCH 12/17] qemu-nonvoid_return
Squelches GCC warnings about undefined return values.
Signed-off-by: Ulrich Hecht <uli@suse.de>
---
hw/mpcore.c | 1 +
target-m68k/translate.c | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/hw/mpcore.c b/hw/mpcore.c
index fc05215..7bdb495 100644
--- a/hw/mpcore.c
+++ b/hw/mpcore.c
@@ -104,6 +104,7 @@ static uint32_t mpcore_timer_read(mpcore_timer_state *s, int offset)
default:
return 0;
}
+ return 0;
}
static void mpcore_timer_write(mpcore_timer_state *s, int offset,
diff --git a/target-m68k/translate.c b/target-m68k/translate.c
index 6f72a2b..7d9492b 100644
--- a/target-m68k/translate.c
+++ b/target-m68k/translate.c
@@ -440,6 +440,7 @@ static inline int opsize_bytes(int opsize)
qemu_assert(0, "bad operand size");
return 0;
}
+ return 0;
}
/* Assign value to a register. If the width is less than the register width
--
1.7.1

View File

@ -0,0 +1,64 @@
From f44ecd4fcdb8e02e6bd58201a81f047d1e109508 Mon Sep 17 00:00:00 2001
From: Ulrich Hecht <uli@suse.de>
Date: Thu, 16 Apr 2009 15:14:12 +0200
Subject: [PATCH 13/17] i386-linux-user NPTL support
Makes NPTL binaries run by implementing TLS.
Signed-off-by: Ulrich Hecht <uli@suse.de>
---
configure | 1 +
linux-user/syscall.c | 16 ++++++++++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 598e8e1..95de763 100755
--- a/configure
+++ b/configure
@@ -2910,6 +2910,7 @@ TARGET_ABI_DIR=""
case "$target_arch2" in
i386)
target_phys_bits=32
+ target_nptl="yes"
;;
x86_64)
TARGET_BASE_ARCH=i386
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 81bf1f0..1a98433 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -3792,8 +3792,14 @@ static int do_fork(CPUState *env, unsigned int flags, abi_ulong newsp,
ts->child_tidptr = child_tidptr;
}
- if (nptl_flags & CLONE_SETTLS)
+ if (nptl_flags & CLONE_SETTLS) {
+#if defined(TARGET_I386) && defined(TARGET_ABI32)
+ do_set_thread_area(new_env, newtls);
+ cpu_x86_load_seg(new_env, R_GS, new_env->segs[R_GS].selector);
+#else
cpu_set_tls (new_env, newtls);
+#endif
+ }
/* Grab a mutex so that thread setup appears atomic. */
pthread_mutex_lock(&clone_lock);
@@ -3867,8 +3873,14 @@ static int do_fork(CPUState *env, unsigned int flags, abi_ulong newsp,
if (flags & CLONE_PARENT_SETTID)
put_user_u32(gettid(), parent_tidptr);
ts = (TaskState *)env->opaque;
- if (flags & CLONE_SETTLS)
+ if (flags & CLONE_SETTLS) {
+#if defined(TARGET_I386) && defined(TARGET_ABI32)
+ do_set_thread_area(env, newtls);
+ cpu_x86_load_seg(env, R_GS, env->segs[R_GS].selector);
+#else
cpu_set_tls (env, newtls);
+#endif
+ }
if (flags & CLONE_CHILD_CLEARTID)
ts->child_tidptr = child_tidptr;
#endif
--
1.7.1

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,58 @@
From 4569b209989e09bdebcb6cce809b3fed0f94142c Mon Sep 17 00:00:00 2001
From: Ulrich Hecht <uli@suse.de>
Date: Wed, 25 Aug 2010 14:23:43 +0200
Subject: [PATCH 16/17] fix mipsn32*-linux-user builds
Signed-off-by: Ulrich Hecht <uli@suse.de>
---
configure | 2 ++
default-configs/mipsn32-linux-user.mak | 1 +
default-configs/mipsn32el-linux-user.mak | 1 +
linux-user/mipsn32/syscall.h | 3 ++-
4 files changed, 6 insertions(+), 1 deletions(-)
create mode 100644 default-configs/mipsn32-linux-user.mak
create mode 100644 default-configs/mipsn32el-linux-user.mak
diff --git a/configure b/configure
index bd1484b..6513d91 100755
--- a/configure
+++ b/configure
@@ -1010,6 +1010,8 @@ m68k-linux-user \
microblaze-linux-user \
mips-linux-user \
mipsel-linux-user \
+mipsn32-linux-user \
+mipsn32el-linux-user \
ppc-linux-user \
ppc64-linux-user \
ppc64abi32-linux-user \
diff --git a/default-configs/mipsn32-linux-user.mak b/default-configs/mipsn32-linux-user.mak
new file mode 100644
index 0000000..31df570
--- /dev/null
+++ b/default-configs/mipsn32-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for mips-linux-user
diff --git a/default-configs/mipsn32el-linux-user.mak b/default-configs/mipsn32el-linux-user.mak
new file mode 100644
index 0000000..4d0e4af
--- /dev/null
+++ b/default-configs/mipsn32el-linux-user.mak
@@ -0,0 +1 @@
+# Default configuration for mipsel-linux-user
diff --git a/linux-user/mipsn32/syscall.h b/linux-user/mipsn32/syscall.h
index 4ec506c..beeeb3c 100644
--- a/linux-user/mipsn32/syscall.h
+++ b/linux-user/mipsn32/syscall.h
@@ -216,6 +216,7 @@ struct target_pt_regs {
#undef TARGET_ENOTRECOVERABLE
#define TARGET_ENOTRECOVERABLE 166 /* State not recoverable */
-
+/* Nasty hack: define a fake errno value for use by sigreturn. */
+#define TARGET_QEMU_ESIGRETURN 255
#define UNAME_MACHINE "mips64"
--
1.7.1

View File

@ -0,0 +1,129 @@
From 024f781ab4af31ba5e14882b5661d4586ae26988 Mon Sep 17 00:00:00 2001
From: Ulrich Hecht <uli@suse.de>
Date: Wed, 9 Feb 2011 18:35:21 +0100
Subject: [PATCH 17/17] S/390 build fix
---
target-s390x/op_helper.c | 22 +++++++++++-----------
target-s390x/translate.c | 2 +-
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/target-s390x/op_helper.c b/target-s390x/op_helper.c
index 20c83c5..46b71fc 100644
--- a/target-s390x/op_helper.c
+++ b/target-s390x/op_helper.c
@@ -738,7 +738,7 @@ uint32_t HELPER(tmxx)(uint64_t val, uint32_t mask)
uint32_t HELPER(abs_i32)(uint32_t reg, int32_t val)
{
uint32_t cc;
- if (val == 0x80000000UL) cc = 3;
+ if ((uint32_t)val == 0x80000000UL) cc = 3;
else if (val) cc = 1;
else cc = 0;
@@ -996,7 +996,7 @@ uint32_t HELPER(slbg)(uint32_t cc, uint32_t r1, uint64_t v1, uint64_t v2)
/* condition codes for binary FP ops */
static uint32_t set_cc_f32(float32 v1, float32 v2)
{
- if (float32_is_nan(v1) || float32_is_nan(v2)) return 3;
+ if (float32_is_any_nan(v1) || float32_is_any_nan(v2)) return 3;
else if (float32_eq(v1, v2, &env->fpu_status)) return 0;
else if (float32_lt(v1, v2, &env->fpu_status)) return 1;
else return 2;
@@ -1004,7 +1004,7 @@ static uint32_t set_cc_f32(float32 v1, float32 v2)
static uint32_t set_cc_f64(float64 v1, float64 v2)
{
- if (float64_is_nan(v1) || float64_is_nan(v2)) return 3;
+ if (float64_is_any_nan(v1) || float64_is_any_nan(v2)) return 3;
else if (float64_eq(v1, v2, &env->fpu_status)) return 0;
else if (float64_lt(v1, v2, &env->fpu_status)) return 1;
else return 2;
@@ -1013,7 +1013,7 @@ static uint32_t set_cc_f64(float64 v1, float64 v2)
/* condition codes for unary FP ops */
static uint32_t set_cc_nz_f32(float32 v)
{
- if (float32_is_nan(v)) return 3;
+ if (float32_is_any_nan(v)) return 3;
else if (float32_is_zero(v)) return 0;
else if (float32_is_neg(v)) return 1;
else return 2;
@@ -1021,7 +1021,7 @@ static uint32_t set_cc_nz_f32(float32 v)
static uint32_t set_cc_nz_f64(float64 v)
{
- if (float64_is_nan(v)) return 3;
+ if (float64_is_any_nan(v)) return 3;
else if (float64_is_zero(v)) return 0;
else if (float64_is_neg(v)) return 1;
else return 2;
@@ -1029,7 +1029,7 @@ static uint32_t set_cc_nz_f64(float64 v)
static uint32_t set_cc_nz_f128(float128 v)
{
- if (float128_is_nan(v)) return 3;
+ if (float128_is_any_nan(v)) return 3;
else if (float128_is_zero(v)) return 0;
else if (float128_is_neg(v)) return 1;
else return 2;
@@ -1350,7 +1350,7 @@ uint32_t HELPER(cxbr)(uint32_t f1, uint32_t f2)
CPU_QuadU v2;
v2.ll.upper = env->fregs[f2].ll;
v2.ll.lower = env->fregs[f2 + 2].ll;
- if (float128_is_nan(v1.q) || float128_is_nan(v2.q)) return 3;
+ if (float128_is_any_nan(v1.q) || float128_is_any_nan(v2.q)) return 3;
else if (float128_eq(v1.q, v2.q, &env->fpu_status)) return 0;
else if (float128_lt(v1.q, v2.q, &env->fpu_status)) return 1;
else return 2;
@@ -1463,7 +1463,7 @@ uint32_t HELPER(cgxbr)(uint32_t r1, uint32_t f2, uint32_t m3)
v2.ll.lower = env->fregs[f2 + 2].ll;
set_round_mode(m3);
env->regs[r1] = float128_to_int64(v2.q, &env->fpu_status);
- if (float128_is_nan(v2.q)) return 3;
+ if (float128_is_any_nan(v2.q)) return 3;
else if (float128_is_zero(v2.q)) return 0;
else if (float128_is_neg(v2.q)) return 1;
else return 2;
@@ -1611,7 +1611,7 @@ uint32_t HELPER(tceb)(uint32_t f1, uint64_t m2)
HELPER_LOG("%s: v1 0x%lx m2 0x%lx neg %d\n", __FUNCTION__, v1, m2, neg);
if (float32_is_zero(v1) && (m2 & (1 << (11-neg)))) cc = 1;
else if (float32_is_infinity(v1) && (m2 & (1 << (5-neg)))) cc = 1;
- else if (float32_is_nan(v1) && (m2 & (1 << (3-neg)))) cc = 1;
+ else if (float32_is_quiet_nan(v1) && (m2 & (1 << (3-neg)))) cc = 1;
else if (float32_is_signaling_nan(v1) && (m2 & (1 << (1-neg)))) cc = 1;
else /* assume normalized number */ if (m2 & (1 << (9-neg))) cc = 1;
/* FIXME: denormalized? */
@@ -1627,7 +1627,7 @@ uint32_t HELPER(tcdb)(uint32_t f1, uint64_t m2)
HELPER_LOG("%s: v1 0x%lx m2 0x%lx neg %d\n", __FUNCTION__, v1, m2, neg);
if (float64_is_zero(v1) && (m2 & (1 << (11-neg)))) cc = 1;
else if (float64_is_infinity(v1) && (m2 & (1 << (5-neg)))) cc = 1;
- else if (float64_is_nan(v1) && (m2 & (1 << (3-neg)))) cc = 1;
+ else if (float64_is_quiet_nan(v1) && (m2 & (1 << (3-neg)))) cc = 1;
else if (float64_is_signaling_nan(v1) && (m2 & (1 << (1-neg)))) cc = 1;
else /* assume normalized number */ if (m2 & (1 << (9-neg))) cc = 1;
/* FIXME: denormalized? */
@@ -1645,7 +1645,7 @@ uint32_t HELPER(tcxb)(uint32_t f1, uint64_t m2)
int neg = float128_is_neg(v1.q);
if (float128_is_zero(v1.q) && (m2 & (1 << (11-neg)))) cc = 1;
else if (float128_is_infinity(v1.q) && (m2 & (1 << (5-neg)))) cc = 1;
- else if (float128_is_nan(v1.q) && (m2 & (1 << (3-neg)))) cc = 1;
+ else if (float128_is_quiet_nan(v1.q) && (m2 & (1 << (3-neg)))) cc = 1;
else if (float128_is_signaling_nan(v1.q) && (m2 & (1 << (1-neg)))) cc = 1;
else /* assume normalized number */ if (m2 & (1 << (9-neg))) cc = 1;
/* FIXME: denormalized? */
diff --git a/target-s390x/translate.c b/target-s390x/translate.c
index e08dcf4..189a60b 100644
--- a/target-s390x/translate.c
+++ b/target-s390x/translate.c
@@ -67,7 +67,7 @@ void cpu_dump_state(CPUState *env, FILE *f, fprintf_function cpu_fprintf,
}
}
for (i = 0; i < 16; i++) {
- cpu_fprintf(f, "F%02d=%016lx", i, (long)env->fregs[i].i);
+ cpu_fprintf(f, "F%02d=%016lx", i, (long)env->fregs[i].ll);
if ((i % 4) == 3) {
cpu_fprintf(f, "\n");
} else {
--
1.7.1

View File

@ -0,0 +1,289 @@
diff -uNr old-qemu-0.14.1//block/raw-win32.c qemu-0.14.1/block/raw-win32.c
--- old-qemu-0.14.1//block/raw-win32.c 2011-05-06 21:01:43.000000000 +0200
+++ qemu-0.14.1/block/raw-win32.c 2011-05-11 15:41:45.744749392 +0200
@@ -93,7 +93,7 @@
else if (!(flags & BDRV_O_CACHE_WB))
overlapped |= FILE_FLAG_WRITE_THROUGH;
s->hfile = CreateFile(filename, access_flags,
- FILE_SHARE_READ, NULL,
+ FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
OPEN_EXISTING, overlapped, NULL);
if (s->hfile == INVALID_HANDLE_VALUE) {
int err = GetLastError();
@@ -354,7 +354,7 @@
else if (!(flags & BDRV_O_CACHE_WB))
overlapped |= FILE_FLAG_WRITE_THROUGH;
s->hfile = CreateFile(filename, access_flags,
- FILE_SHARE_READ, NULL,
+ FILE_SHARE_READ | FILE_SHARE_WRITE, NULL,
create_flags, overlapped, NULL);
if (s->hfile == INVALID_HANDLE_VALUE) {
int err = GetLastError();
diff -uNr old-qemu-0.14.1//hw/e1000.c qemu-0.14.1/hw/e1000.c
--- old-qemu-0.14.1//hw/e1000.c 2011-05-06 21:01:43.000000000 +0200
+++ qemu-0.14.1/hw/e1000.c 2011-05-11 15:41:45.744749392 +0200
@@ -573,7 +573,7 @@
if (rctl & E1000_RCTL_UPE) // promiscuous
return 1;
- if ((buf[0] & 1) && (rctl & E1000_RCTL_MPE)) // promiscuous mcast
+ if ((buf[0] & 1)) //&& (rctl & E1000_RCTL_MPE)) // promiscuous mcast
return 1;
if ((rctl & E1000_RCTL_BAM) && !memcmp(buf, bcast, sizeof bcast))
diff -uNr old-qemu-0.14.1//Makefile.objs qemu-0.14.1/Makefile.objs
--- old-qemu-0.14.1//Makefile.objs 2011-05-06 21:01:43.000000000 +0200
+++ qemu-0.14.1/Makefile.objs 2011-05-11 15:41:45.751749392 +0200
@@ -34,6 +34,7 @@
net-nested-y = queue.o checksum.o util.o
net-nested-y += socket.o
net-nested-y += dump.o
+net-nested-y += udp.o
net-nested-$(CONFIG_POSIX) += tap.o
net-nested-$(CONFIG_LINUX) += tap-linux.o
net-nested-$(CONFIG_WIN32) += tap-win32.o
diff -uNr old-qemu-0.14.1//net/udp.c qemu-0.14.1/net/udp.c
--- old-qemu-0.14.1//net/udp.c 1970-01-01 01:00:00.000000000 +0100
+++ qemu-0.14.1/net/udp.c 2011-05-11 15:41:45.752749392 +0200
@@ -0,0 +1,138 @@
+/*
+ * QEMU System Emulator
+ *
+ * Copyright (c) 2003-2008 Fabrice Bellard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#include "net/udp.h"
+
+#include "config-host.h"
+
+#ifndef _WIN32
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <netinet/udp.h>
+#endif
+
+#include "net.h"
+#include "qemu-char.h"
+#include "qemu-common.h"
+#include "qemu-option.h"
+#include "qemu_socket.h"
+#include "sysemu.h"
+
+
+typedef struct UDPState {
+ VLANClientState nc;
+ int rfd;
+ struct sockaddr_in sender;
+} UDPState;
+
+static void udp_to_qemu(void *opaque)
+{
+ UDPState *s = opaque;
+ uint8_t buf[4096];
+ int size;
+
+ size = recvfrom(s->rfd, (char *)buf, sizeof(buf), 0, NULL, NULL);
+ if (size > 0) {
+ qemu_send_packet(&s->nc, buf, size);
+ }
+}
+
+static ssize_t udp_receive(VLANClientState *nc, const uint8_t *buf, size_t size)
+{
+ UDPState *s = DO_UPCAST(UDPState, nc, nc);
+ int ret;
+
+ do {
+ ret = sendto(s->rfd, (const char *)buf, size, 0, (struct sockaddr *)&s->sender, sizeof (s->sender));
+ } while (ret < 0 && errno == EINTR);
+
+ return ret;
+}
+
+static void udp_cleanup(VLANClientState *nc)
+{
+ UDPState *s = DO_UPCAST(UDPState, nc, nc);
+ qemu_set_fd_handler(s->rfd, NULL, NULL, NULL);
+ close(s->rfd);
+}
+
+static NetClientInfo net_udp_info = {
+ .type = NET_CLIENT_TYPE_UDP,
+ .size = sizeof(UDPState),
+ .receive = udp_receive,
+ .cleanup = udp_cleanup,
+};
+
+static int net_udp_init(VLANState *vlan, const char *model,
+ const char *name, int sport,
+ const char *daddr, int dport)
+{
+ VLANClientState *nc;
+ UDPState *s;
+ struct sockaddr_in receiver;
+ int ret;
+
+ nc = qemu_new_net_client(&net_udp_info, vlan, NULL, model, name);
+
+ snprintf(nc->info_str, sizeof(nc->info_str),"udp: %i->%s:%i",
+ sport, daddr, dport);
+
+ s = DO_UPCAST(UDPState, nc, nc);
+
+ s->rfd = socket(AF_INET,SOCK_DGRAM,IPPROTO_UDP);
+ receiver.sin_family = AF_INET;
+ receiver.sin_addr.s_addr = INADDR_ANY;
+ receiver.sin_port = htons(sport);
+ ret = bind(s->rfd, (struct sockaddr *)&receiver, sizeof(receiver));
+
+ if (ret == -1) {
+ fprintf (stderr, "bind error:%s\n", strerror(errno));
+ return ret;
+ }
+
+ memset((char*)&s->sender, 0,sizeof(s->sender));
+ s->sender.sin_family = AF_INET;
+ s->sender.sin_port = htons(dport);
+ inet_aton(daddr, &s->sender.sin_addr);
+
+ qemu_set_fd_handler(s->rfd, udp_to_qemu, NULL, s);
+
+ return 0;
+}
+
+int net_init_udp(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan)
+{
+ const char *daddr;
+ int sport, dport;
+
+ daddr = qemu_opt_get(opts, "daddr");
+
+ sport = qemu_opt_get_number(opts, "sport", 0);
+ dport = qemu_opt_get_number(opts, "dport", 0);
+
+ if (net_udp_init(vlan, "udp", name, sport, daddr, dport) == -1) {
+ return -1;
+ }
+
+ return 0;
+}
diff -uNr old-qemu-0.14.1//net/udp.h qemu-0.14.1/net/udp.h
--- old-qemu-0.14.1//net/udp.h 1970-01-01 01:00:00.000000000 +0100
+++ qemu-0.14.1/net/udp.h 2011-05-11 15:41:45.752749392 +0200
@@ -0,0 +1,32 @@
+/*
+ * QEMU System Emulator
+ *
+ * Copyright (c) 2003-2008 Fabrice Bellard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+#ifndef QEMU_NET_UDP_H
+#define QEMU_NET_UDP_H
+
+#include "qemu-common.h"
+#include "qemu-option.h"
+
+int net_init_udp(QemuOpts *opts, Monitor *mon, const char *name, VLANState *vlan);
+
+#endif /* QEMU_NET_UDP_H */
diff -uNr old-qemu-0.14.1//net.c qemu-0.14.1/net.c
--- old-qemu-0.14.1//net.c 2011-05-06 21:01:44.000000000 +0200
+++ qemu-0.14.1/net.c 2011-05-11 15:42:53.145749408 +0200
@@ -30,6 +30,7 @@
#include "net/dump.h"
#include "net/slirp.h"
#include "net/vde.h"
+#include "net/udp.h"
#include "net/util.h"
#include "monitor.h"
#include "sysemu.h"
@@ -1085,9 +1086,31 @@
.help = "permissions for socket",
},
{ /* end of list */ }
- },
+ },
#endif
}, {
+
+ .type = "udp",
+ .init = net_init_udp,
+ .desc = {
+ NET_COMMON_PARAMS_DESC,
+ {
+ .name = "sport",
+ .type = QEMU_OPT_NUMBER,
+
+ .help = "source port number",
+ }, {
+ .name = "daddr",
+ .type = QEMU_OPT_STRING,
+ .help = "destination IP address",
+ }, {
+ .name = "dport",
+ .type = QEMU_OPT_NUMBER,
+ .help = "destination port number",
+ },
+ { /* end of list */ }
+ },
+ }, {
.type = "dump",
.init = net_init_dump,
.desc = {
diff -uNr old-qemu-0.14.1//net.h qemu-0.14.1/net.h
--- old-qemu-0.14.1//net.h 2011-05-06 21:01:44.000000000 +0200
+++ qemu-0.14.1/net.h 2011-05-11 15:41:45.754749392 +0200
@@ -35,6 +35,7 @@
NET_CLIENT_TYPE_TAP,
NET_CLIENT_TYPE_SOCKET,
NET_CLIENT_TYPE_VDE,
+ NET_CLIENT_TYPE_UDP,
NET_CLIENT_TYPE_DUMP
} net_client_type;
diff -uNr old-qemu-0.14.1//qemu-options.hx qemu-0.14.1/qemu-options.hx
--- old-qemu-0.14.1//qemu-options.hx 2011-05-06 21:01:44.000000000 +0200
+++ qemu-0.14.1/qemu-options.hx 2011-05-11 15:41:45.755749392 +0200
@@ -1070,6 +1070,8 @@
"-net socket[,vlan=n][,name=str][,fd=h][,mcast=maddr:port[,localaddr=addr]]\n"
" connect the vlan 'n' to multicast maddr and port\n"
" use 'localaddr=addr' to specify the host address to send packets from\n"
+ "-net udp[,vlan=n]sport=sport,dport=dport,daddr=host\n"
+ " connect the vlan 'n' to a UDP tunnel (for Dynamips/GNS3)\n"
#ifdef CONFIG_VDE
"-net vde[,vlan=n][,name=str][,sock=socketpath][,port=n][,group=groupname][,mode=octalmode]\n"
" connect the vlan 'n' to port 'n' of a vde switch running\n"

View File

@ -0,0 +1,52 @@
From 39c6bee3d5023a3e339bafd8073bc2c920cd79c5 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Sun, 25 Sep 2011 06:21:28 +0200
Subject: [PATCH] linux-user: fix openat
When running openat using qemu-arm, we stumbled over invalid permissions
on the created files. The reason for this is that the mode parameter gets
treates as an O_... flag, which it isn't - it's a permission bitmask.
This patch removes the needless translation of the mode parameter,
rendering permission passing of openat() to work with linux-user.
Reported-by: Dirk Mueller <dmueller@suse.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
---
linux-user/syscall.c | 14 +-------------
1 files changed, 1 insertions(+), 13 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 6b73769..27970a4 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -376,25 +376,13 @@ static int sys_mknodat(int dirfd, const char *pathname, mode_t mode,
}
#endif
#ifdef TARGET_NR_openat
-static int sys_openat(int dirfd, const char *pathname, int flags, ...)
+static int sys_openat(int dirfd, const char *pathname, int flags, mode_t mode)
{
/*
* open(2) has extra parameter 'mode' when called with
* flag O_CREAT.
*/
if ((flags & O_CREAT) != 0) {
- va_list ap;
- mode_t mode;
-
- /*
- * Get the 'mode' parameter and translate it to
- * host bits.
- */
- va_start(ap, flags);
- mode = va_arg(ap, mode_t);
- mode = target_to_host_bitmask(mode, fcntl_flags_tbl);
- va_end(ap);
-
return (openat(dirfd, pathname, flags, mode));
}
return (openat(dirfd, pathname, flags));
--
1.6.0.2

View File

@ -0,0 +1,40 @@
From: Alexander Graf <agraf@suse.de>
For OBS, we're running a full cross-guest inside of a VM. When a build
is done there, we reboot the guest as shutdown mechanism.
Unfortunately, reboot is not implemented in linux-user. So this mechanism
fails, spilling unpretty warnings. This patch implements sys_reboot()
emulation.
Signed-off-by: Alexander Graf <agraf@suse.de>
---
linux-user/syscall.c | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
Index: qemu-0.14.1/linux-user/syscall.c
===================================================================
--- qemu-0.14.1.orig/linux-user/syscall.c
+++ qemu-0.14.1/linux-user/syscall.c
@@ -239,6 +239,8 @@ _syscall6(int,sys_futex,int *,uaddr,int,
const struct timespec *,timeout,int *,uaddr2,int,val3)
#endif
#endif
+_syscall4(int, reboot, int, magic1, int, magic2, unsigned int, cmd,
+ void *, arg);
static bitmask_transtbl fcntl_flags_tbl[] = {
{ TARGET_O_ACCMODE, TARGET_O_WRONLY, O_ACCMODE, O_WRONLY, },
@@ -5536,7 +5538,11 @@ abi_long do_syscall(void *cpu_env, int n
break;
#endif
case TARGET_NR_reboot:
- goto unimplemented;
+ if (!(p = lock_user_string(arg4)))
+ goto efault;
+ ret = reboot(arg1, arg2, arg3, p);
+ unlock_user(p, arg4, 0);
+ break;
#ifdef TARGET_NR_readdir
case TARGET_NR_readdir:
goto unimplemented;

View File

@ -0,0 +1,117 @@
From agraf@suse.de Thu, 29 Sep 2011 11:00:25 +0200
Return-Path: <agraf@suse.de>
Received: from imap.suse.de ([unix socket])
by imap-int (Cyrus v2.2.12) with LMTPA;
Thu, 29 Sep 2011 11:07:10 +0200
X-Sieve: CMU Sieve 2.2
Received: from relay2.suse.de (relay2.suse.de [149.44.160.134])
(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
(Client CN "relay.suse.de", Issuer "CAcert Class 3 Root" (verified OK))
by imap.suse.de (Postfix) with ESMTPS id AF8563C539A9
for <adrian@imap.suse.de>; Thu, 29 Sep 2011 11:07:10 +0200 (CEST)
Received: by relay2.suse.de (Postfix)
id A639118552E6; Thu, 29 Sep 2011 11:07:10 +0200 (CEST)
Received: from imap.suse.de (loadbalancer1.suse.de [149.44.160.248])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by relay2.suse.de (Postfix) with ESMTPS id A573518552E1;
Thu, 29 Sep 2011 11:07:10 +0200 (CEST)
Received: from localhost.localdomain (charybdis-ext.suse.de [195.135.221.2])
(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
(Client did not present a certificate)
by imap.suse.de (Postfix) with ESMTPSA id 7AD993C539A9;
Thu, 29 Sep 2011 11:07:10 +0200 (CEST)
From: Alexander Graf <agraf@suse.de>
To: adrian@suse.de
Cc: Peter Maydell <peter.maydell@linaro.org>, Riku Voipio <riku.voipio@linaro.org>
Subject: [PATCH] linux-user: Implement prlimit64 syscall
Date: Thu, 29 Sep 2011 11:00:25 +0200
Message-Id: <1317286825-2033-1-git-send-email-agraf@suse.de>
X-Mailer: git-send-email 1.6.0.2
From: Peter Maydell <peter.maydell@linaro.org>
Implement the prlimit64 syscall.
Slightly modified to apply upstream -Riku
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Index: qemu-0.14.1/linux-user/syscall.c
===================================================================
--- qemu-0.14.1.orig/linux-user/syscall.c
+++ qemu-0.14.1/linux-user/syscall.c
@@ -524,6 +524,21 @@ static int sys_inotify_init1(int flags)
#endif /* CONFIG_INOTIFY */
+#if defined(TARGET_NR_prlimit64)
+#ifndef __NR_prlimit64
+# define __NR_prlimit64 -1
+#endif
+#define __NR_sys_prlimit64 __NR_prlimit64
+/* The glibc rlimit structure may not be that used by the underlying syscall */
+struct host_rlimit64 {
+ uint64_t rlim_cur;
+ uint64_t rlim_max;
+};
+_syscall4(int, sys_prlimit64, pid_t, pid, int, resource,
+ const struct host_rlimit64 *, new_limit,
+ struct host_rlimit64 *, old_limit)
+#endif
+
extern int personality(int);
extern int flock(int, int);
extern int setfsuid(int);
@@ -7620,6 +7635,34 @@ abi_long do_syscall(void *cpu_env, int n
break;
}
#endif
+#ifdef TARGET_NR_prlimit64
+ case TARGET_NR_prlimit64:
+ {
+ /* args: pid, resource number, ptr to new rlimit, ptr to old rlimit */
+ struct target_rlimit64 *target_rnew, *target_rold;
+ struct host_rlimit64 rnew, rold, *rnewp = 0;
+ if (arg3) {
+ if (!lock_user_struct(VERIFY_READ, target_rnew, arg3, 1)) {
+ goto efault;
+ }
+ rnew.rlim_cur = tswap64(target_rnew->rlim_cur);
+ rnew.rlim_max = tswap64(target_rnew->rlim_max);
+ unlock_user_struct(target_rnew, arg3, 0);
+ rnewp = &rnew;
+ }
+
+ ret = get_errno(sys_prlimit64(arg1, arg2, rnewp, arg4 ? &rold : 0));
+ if (!is_error(ret) && arg4) {
+ if (!lock_user_struct(VERIFY_WRITE, target_rold, arg4, 1)) {
+ goto efault;
+ }
+ target_rold->rlim_cur = tswap64(rold.rlim_cur);
+ target_rold->rlim_max = tswap64(rold.rlim_max);
+ unlock_user_struct(target_rold, arg4, 1);
+ }
+ break;
+ }
+#endif
default:
unimplemented:
Index: qemu-0.14.1/linux-user/syscall_defs.h
===================================================================
--- qemu-0.14.1.orig/linux-user/syscall_defs.h
+++ qemu-0.14.1/linux-user/syscall_defs.h
@@ -2237,6 +2237,11 @@ struct target_mq_attr {
abi_long mq_curmsgs;
};
+struct target_rlimit64 {
+ uint64_t rlim_cur;
+ uint64_t rlim_max;
+};
+
#include "socket.h"
#include "errno_defs.h"

View File

@ -0,0 +1,34 @@
From: Alexander Graf <agraf@suse.de>
fixes some SMP races
---
cpu-all.h | 2 +-
exec.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Index: qemu-0.14.1/cpu-all.h
===================================================================
--- qemu-0.14.1.orig/cpu-all.h
+++ qemu-0.14.1/cpu-all.h
@@ -775,7 +775,7 @@ void cpu_dump_statistics(CPUState *env,
void QEMU_NORETURN cpu_abort(CPUState *env, const char *fmt, ...)
GCC_FMT_ATTR(2, 3);
extern CPUState *first_cpu;
-extern CPUState *cpu_single_env;
+extern __thread CPUState *cpu_single_env;
#define CPU_INTERRUPT_HARD 0x02 /* hardware interrupt pending */
#define CPU_INTERRUPT_EXITTB 0x04 /* exit the current TB (use for x86 a20 case) */
Index: qemu-0.14.1/exec.c
===================================================================
--- qemu-0.14.1.orig/exec.c
+++ qemu-0.14.1/exec.c
@@ -112,7 +112,7 @@ RAMList ram_list = { .blocks = QLIST_HEA
CPUState *first_cpu;
/* current CPU in the current thread. It is only valid inside
cpu_exec() */
-CPUState *cpu_single_env;
+__thread CPUState *cpu_single_env;
/* 0 = Do not count executed instructions.
1 = Precise instruction counting.
2 = Adaptive rate instruction counting. */

View File

@ -0,0 +1,167 @@
From 864b2c7da05bc29a94b3e792b100dd5189576942 Mon Sep 17 00:00:00 2001
From: Alexander Graf <agraf@suse.de>
Date: Fri, 30 Sep 2011 19:40:36 +0200
Subject: [PATCH] linux-user: add binfmt wrapper for argv[0] handling
When using qemu's linux-user binaries through binfmt, argv[0] gets lost
along the execution because qemu only gets passed in the full file name
to the executable while argv[0] can be something completely different.
This breaks in some subtile situations, such as the grep and make test
suites.
This patch adds a wrapper binary called qemu-$TARGET-binfmt that can be
used with binfmt's P flag which passes the full path _and_ argv[0] to
the binfmt handler.
The binary would be smart enough to be versatile and only exist in the
system once, creating the qemu binary path names from its own argv[0].
However, this seemed like it didn't fit the make system too well, so
we're currently creating a new binary for each target archictecture.
CC: Reinhard Max <max@suse.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
---
Makefile.target | 8 ++++++++
linux-user/binfmt.c | 42 ++++++++++++++++++++++++++++++++++++++++++
scripts/qemu-binfmt-conf.sh | 34 +++++++++++++++++-----------------
3 files changed, 67 insertions(+), 17 deletions(-)
create mode 100644 linux-user/binfmt.c
Index: qemu-0.14.1/Makefile.target
===================================================================
--- qemu-0.14.1.orig/Makefile.target
+++ qemu-0.14.1/Makefile.target
@@ -33,6 +33,10 @@ endif
PROGS=$(QEMU_PROG)
STPFILES=
+ifdef CONFIG_LINUX_USER
+PROGS+=$(QEMU_PROG)-binfmt
+endif
+
ifndef CONFIG_HAIKU
LIBS+=-lm
endif
@@ -131,6 +135,8 @@ obj-y += $(addprefix ../libuser/, $(user
obj-y += $(addprefix ../libdis-user/, $(libdis-y))
obj-y += $(libobj-y)
+obj-binfmt-y += binfmt.o
+
endif #CONFIG_LINUX_USER
#########################################################
@@ -346,6 +352,8 @@ obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml
$(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)
$(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y))
+$(QEMU_PROG)-binfmt: $(obj-binfmt-y)
+ $(call LINK,$^)
gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh
$(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES)," GEN $(TARGET_DIR)$@")
Index: qemu-0.14.1/linux-user/binfmt.c
===================================================================
--- /dev/null
+++ qemu-0.14.1/linux-user/binfmt.c
@@ -0,0 +1,42 @@
+#include <stdio.h>
+#include <stdarg.h>
+#include <unistd.h>
+#include <libgen.h>
+#include <string.h>
+#include <stdlib.h>
+
+
+int main(int argc, char **argv, char **envp)
+{
+ char *binfmt;
+ char **new_argv;
+
+ /*
+ * Check if our file name ends with -binfmt
+ */
+ binfmt = argv[0] + strlen(argv[0]) - strlen("-binfmt");
+ if (strcmp(binfmt, "-binfmt")) {
+ fprintf(stderr, "%s: Invalid executable name\n", argv[0]);
+ exit(1);
+ }
+ if (argc < 3) {
+ fprintf(stderr, "%s: Please use me through binfmt with P flag\n",
+ argv[0]);
+ exit(1);
+ }
+
+ binfmt[0] = '\0';
+ /* Now argv[0] is the real qemu binary name */
+
+ new_argv = (char **)malloc((argc + 2) * sizeof(*new_argv));
+ if (argc > 3) {
+ memcpy(&new_argv[4], &argv[3], (argc - 3) * sizeof(*new_argv));
+ }
+ new_argv[0] = argv[0];
+ new_argv[1] = (char *)"-0";
+ new_argv[2] = argv[2];
+ new_argv[3] = argv[1];
+ new_argv[argc + 1] = NULL;
+
+ return execve(new_argv[0], new_argv, envp);
+}
Index: qemu-0.14.1/scripts/qemu-binfmt-conf.sh
===================================================================
--- qemu-0.14.1.orig/scripts/qemu-binfmt-conf.sh
+++ qemu-0.14.1/scripts/qemu-binfmt-conf.sh
@@ -34,36 +34,36 @@ esac
# register the interpreter for each cpu except for the native one
if [ $cpu != "i386" ] ; then
- echo ':i386:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386:' > /proc/sys/fs/binfmt_misc/register
- echo ':i486:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386:' > /proc/sys/fs/binfmt_misc/register
+ echo ':i386:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x03\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386-binfmt:P' > /proc/sys/fs/binfmt_misc/register
+ echo ':i486:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x06\x00:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-i386-binfmt:P' > /proc/sys/fs/binfmt_misc/register
fi
if [ $cpu != "alpha" ] ; then
- echo ':alpha:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-alpha:' > /proc/sys/fs/binfmt_misc/register
+ echo ':alpha:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x26\x90:\xff\xff\xff\xff\xff\xfe\xfe\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-alpha-binfmt:P' > /proc/sys/fs/binfmt_misc/register
fi
if [ $cpu != "arm" ] ; then
- echo ':arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm:' > /proc/sys/fs/binfmt_misc/register
- echo ':armeb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-armeb:' > /proc/sys/fs/binfmt_misc/register
+ echo ':arm:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-arm-binfmt:P' > /proc/sys/fs/binfmt_misc/register
+ echo ':armeb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-armeb-binfmt:P' > /proc/sys/fs/binfmt_misc/register
fi
if [ $cpu != "sparc" ] ; then
- echo ':sparc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc:' > /proc/sys/fs/binfmt_misc/register
+ echo ':sparc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x02:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sparc-binfmt:P' > /proc/sys/fs/binfmt_misc/register
fi
if [ $cpu != "ppc" ] ; then
- echo ':ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc:' > /proc/sys/fs/binfmt_misc/register
+ echo ':ppc:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x14:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-ppc-binfmt:P' > /proc/sys/fs/binfmt_misc/register
fi
if [ $cpu != "m68k" ] ; then
echo 'Please check cpu value and header information for m68k!'
- echo ':m68k:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-m68k:' > /proc/sys/fs/binfmt_misc/register
+ echo ':m68k:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x04\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-m68k-binfmt:P' > /proc/sys/fs/binfmt_misc/register
fi
if [ $cpu != "mips" ] ; then
# FIXME: We could use the other endianness on a MIPS host.
- echo ':mips:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips:' > /proc/sys/fs/binfmt_misc/register
- echo ':mipsel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsel:' > /proc/sys/fs/binfmt_misc/register
- echo ':mipsn32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mipsn32:' > /proc/sys/fs/binfmt_misc/register
- echo ':mipsn32el:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsn32el:' > /proc/sys/fs/binfmt_misc/register
- echo ':mips64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips64:' > /proc/sys/fs/binfmt_misc/register
- echo ':mips64el:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mips64el:' > /proc/sys/fs/binfmt_misc/register
+ echo ':mips:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips-binfmt:P' > /proc/sys/fs/binfmt_misc/register
+ echo ':mipsel:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsel-binfmt:P' > /proc/sys/fs/binfmt_misc/register
+ echo ':mipsn32:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mipsn32-binfmt:P' > /proc/sys/fs/binfmt_misc/register
+ echo ':mipsn32el:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mipsn32el-binfmt:P' > /proc/sys/fs/binfmt_misc/register
+ echo ':mips64:M::\x7fELF\x02\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-mips64-binfmt:P' > /proc/sys/fs/binfmt_misc/register
+ echo ':mips64el:M::\x7fELF\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x08\x00:\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-mips64el-binfmt:P' > /proc/sys/fs/binfmt_misc/register
fi
if [ $cpu != "sh" ] ; then
- echo ':sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-sh4:' > /proc/sys/fs/binfmt_misc/register
- echo ':sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sh4eb:' > /proc/sys/fs/binfmt_misc/register
+ echo ':sh4:M::\x7fELF\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a\x00:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff:/usr/bin/qemu-sh4-binfmt:P' > /proc/sys/fs/binfmt_misc/register
+ echo ':sh4eb:M::\x7fELF\x01\x02\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x2a:\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff:/usr/bin/qemu-sh4eb-binfmt:P' > /proc/sys/fs/binfmt_misc/register
fi

View File

@ -0,0 +1,460 @@
From bf858897b76926b56e948dbe7a1a491b68dccda7 Mon Sep 17 00:00:00 2001
From: Richard Henderson <rth@twiddle.net>
Date: Tue, 27 Jul 2010 17:25:38 +0000
Subject: linux-user: Re-use load_elf_image for the main binary.
This requires moving the PT_INTERP extraction and GUEST_BASE
handling into load_elf_image. Key this off a non-null pointer
argument to receive the interpreter name.
Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
---
diff --git a/linux-user/elfload.c b/linux-user/elfload.c
index 0a3d084..a53285a 100644
--- a/linux-user/elfload.c
+++ b/linux-user/elfload.c
@@ -829,9 +829,6 @@ struct exec
#define ZMAGIC 0413
#define QMAGIC 0314
-/* max code+data+bss+brk space allocated to ET_DYN executables */
-#define ET_DYN_MAP_SIZE (128 * 1024 * 1024)
-
/* Necessary parameters */
#define TARGET_ELF_EXEC_PAGESIZE TARGET_PAGE_SIZE
#define TARGET_ELF_PAGESTART(_v) ((_v) & ~(unsigned long)(TARGET_ELF_EXEC_PAGESIZE-1))
@@ -1169,7 +1166,7 @@ static abi_ulong create_elf_tables(abi_ulong p, int argc, int envc,
On return: INFO values will be filled in, as necessary or available. */
static void load_elf_image(const char *image_name, int image_fd,
- struct image_info *info,
+ struct image_info *info, char **pinterp_name,
char bprm_buf[BPRM_BUF_SIZE])
{
struct elfhdr *ehdr = (struct elfhdr *)bprm_buf;
@@ -1229,6 +1226,67 @@ static void load_elf_image(const char *image_name, int image_fd,
if (load_addr == -1) {
goto exit_perror;
}
+ } else if (pinterp_name != NULL) {
+ /* This is the main executable. Make sure that the low
+ address does not conflict with MMAP_MIN_ADDR or the
+ QEMU application itself. */
+#if defined(CONFIG_USE_GUEST_BASE)
+ /*
+ * In case where user has not explicitly set the guest_base, we
+ * probe here that should we set it automatically.
+ */
+ if (!have_guest_base && !reserved_va) {
+ unsigned long host_start, real_start, host_size;
+
+ /* Round addresses to page boundaries. */
+ loaddr &= qemu_host_page_mask;
+ hiaddr = HOST_PAGE_ALIGN(hiaddr);
+
+ if (loaddr < mmap_min_addr) {
+ host_start = HOST_PAGE_ALIGN(mmap_min_addr);
+ } else {
+ host_start = loaddr;
+ if (host_start != loaddr) {
+ errmsg = "Address overflow loading ELF binary";
+ goto exit_errmsg;
+ }
+ }
+ host_size = hiaddr - loaddr;
+ while (1) {
+ /* Do not use mmap_find_vma here because that is limited to the
+ guest address space. We are going to make the
+ guest address space fit whatever we're given. */
+ real_start = (unsigned long)
+ mmap((void *)host_start, host_size, PROT_NONE,
+ MAP_ANONYMOUS | MAP_PRIVATE | MAP_NORESERVE, -1, 0);
+ if (real_start == (unsigned long)-1) {
+ goto exit_perror;
+ }
+ if (real_start == host_start) {
+ break;
+ }
+ /* That address didn't work. Unmap and try a different one.
+ The address the host picked because is typically right at
+ the top of the host address space and leaves the guest with
+ no usable address space. Resort to a linear search. We
+ already compensated for mmap_min_addr, so this should not
+ happen often. Probably means we got unlucky and host
+ address space randomization put a shared library somewhere
+ inconvenient. */
+ munmap((void *)real_start, host_size);
+ host_start += qemu_host_page_size;
+ if (host_start == loaddr) {
+ /* Theoretically possible if host doesn't have any suitably
+ aligned areas. Normally the first mmap will fail. */
+ errmsg = "Unable to find space for application";
+ goto exit_errmsg;
+ }
+ }
+ qemu_log("Relocating guest address space from 0x"
+ TARGET_ABI_FMT_lx " to 0x%lx\n", loaddr, real_start);
+ guest_base = real_start - loaddr;
+ }
+#endif
}
load_bias = load_addr - loaddr;
@@ -1290,6 +1348,33 @@ static void load_elf_image(const char *image_name, int image_fd,
info->brk = vaddr_em;
}
}
+ } else if (eppnt->p_type == PT_INTERP && pinterp_name) {
+ char *interp_name;
+
+ if (*pinterp_name) {
+ errmsg = "Multiple PT_INTERP entries";
+ goto exit_errmsg;
+ }
+ interp_name = malloc(eppnt->p_filesz);
+ if (!interp_name) {
+ goto exit_perror;
+ }
+
+ if (eppnt->p_offset + eppnt->p_filesz <= BPRM_BUF_SIZE) {
+ memcpy(interp_name, bprm_buf + eppnt->p_offset,
+ eppnt->p_filesz);
+ } else {
+ retval = pread(image_fd, interp_name, eppnt->p_filesz,
+ eppnt->p_offset);
+ if (retval != eppnt->p_filesz) {
+ goto exit_perror;
+ }
+ }
+ if (interp_name[eppnt->p_filesz - 1] != 0) {
+ errmsg = "Invalid PT_INTERP entry";
+ goto exit_errmsg;
+ }
+ *pinterp_name = interp_name;
}
}
@@ -1336,7 +1421,7 @@ static void load_elf_interp(const char *filename, struct image_info *info,
memset(bprm_buf + retval, 0, BPRM_BUF_SIZE - retval);
}
- load_elf_image(filename, fd, info, bprm_buf);
+ load_elf_image(filename, fd, info, NULL, bprm_buf);
return;
exit_perror:
@@ -1480,291 +1565,31 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs,
{
struct image_info interp_info;
struct elfhdr elf_ex;
- abi_ulong load_addr, load_bias;
- int load_addr_set = 0;
- int i;
- struct elf_phdr * elf_ppnt;
- struct elf_phdr *elf_phdata;
- abi_ulong k, elf_brk;
- int retval;
char *elf_interpreter = NULL;
- abi_ulong elf_entry;
- int status;
- abi_ulong start_code, end_code, start_data, end_data;
- abi_ulong elf_stack;
- status = 0;
- load_addr = 0;
- load_bias = 0;
- elf_ex = *((struct elfhdr *) bprm->buf); /* exec-header */
+ info->start_mmap = (abi_ulong)ELF_START_MMAP;
+ info->mmap = 0;
+ info->rss = 0;
- /* First of all, some simple consistency checks */
- if (!elf_check_ident(&elf_ex)) {
- return -ENOEXEC;
- }
- bswap_ehdr(&elf_ex);
- if (!elf_check_ehdr(&elf_ex)) {
- return -ENOEXEC;
- }
+ load_elf_image(bprm->filename, bprm->fd, info,
+ &elf_interpreter, bprm->buf);
+
+ /* ??? We need a copy of the elf header for passing to create_elf_tables.
+ If we do nothing, we'll have overwritten this when we re-use bprm->buf
+ when we load the interpreter. */
+ elf_ex = *(struct elfhdr *)bprm->buf;
bprm->p = copy_elf_strings(1, &bprm->filename, bprm->page, bprm->p);
bprm->p = copy_elf_strings(bprm->envc,bprm->envp,bprm->page,bprm->p);
bprm->p = copy_elf_strings(bprm->argc,bprm->argv,bprm->page,bprm->p);
if (!bprm->p) {
- retval = -E2BIG;
- }
-
- /* Now read in all of the header information */
- elf_phdata = (struct elf_phdr *)
- malloc(elf_ex.e_phnum * sizeof(struct elf_phdr));
- if (elf_phdata == NULL) {
- return -ENOMEM;
- }
-
- i = elf_ex.e_phnum * sizeof(struct elf_phdr);
- if (elf_ex.e_phoff + i <= BPRM_BUF_SIZE) {
- memcpy(elf_phdata, bprm->buf + elf_ex.e_phoff, i);
- } else {
- retval = pread(bprm->fd, (char *) elf_phdata, i, elf_ex.e_phoff);
- if (retval != i) {
- perror("load_elf_binary");
- exit(-1);
- }
- }
- bswap_phdr(elf_phdata, elf_ex.e_phnum);
-
- elf_brk = 0;
- elf_stack = ~((abi_ulong)0UL);
- start_code = ~((abi_ulong)0UL);
- end_code = 0;
- start_data = 0;
- end_data = 0;
-
- elf_ppnt = elf_phdata;
- for(i=0;i < elf_ex.e_phnum; i++) {
- if (elf_ppnt->p_type == PT_INTERP) {
- if (elf_ppnt->p_offset + elf_ppnt->p_filesz <= BPRM_BUF_SIZE) {
- elf_interpreter = bprm->buf + elf_ppnt->p_offset;
- } else {
- elf_interpreter = alloca(elf_ppnt->p_filesz);
- retval = pread(bprm->fd, elf_interpreter, elf_ppnt->p_filesz,
- elf_ppnt->p_offset);
- if (retval != elf_ppnt->p_filesz) {
- perror("load_elf_binary");
- exit(-1);
- }
- }
- }
- elf_ppnt++;
- }
-
- /* OK, This is the point of no return */
- info->end_data = 0;
- info->end_code = 0;
- info->start_mmap = (abi_ulong)ELF_START_MMAP;
- info->mmap = 0;
- elf_entry = (abi_ulong) elf_ex.e_entry;
-
-#if defined(CONFIG_USE_GUEST_BASE)
- /*
- * In case where user has not explicitly set the guest_base, we
- * probe here that should we set it automatically.
- */
- if (!(have_guest_base || reserved_va)) {
- /*
- * Go through ELF program header table and find the address
- * range used by loadable segments. Check that this is available on
- * the host, and if not find a suitable value for guest_base. */
- abi_ulong app_start = ~0;
- abi_ulong app_end = 0;
- abi_ulong addr;
- unsigned long host_start;
- unsigned long real_start;
- unsigned long host_size;
- for (i = 0, elf_ppnt = elf_phdata; i < elf_ex.e_phnum;
- i++, elf_ppnt++) {
- if (elf_ppnt->p_type != PT_LOAD)
- continue;
- addr = elf_ppnt->p_vaddr;
- if (addr < app_start) {
- app_start = addr;
- }
- addr += elf_ppnt->p_memsz;
- if (addr > app_end) {
- app_end = addr;
- }
- }
-
- /* If we don't have any loadable segments then something
- is very wrong. */
- assert(app_start < app_end);
-
- /* Round addresses to page boundaries. */
- app_start = app_start & qemu_host_page_mask;
- app_end = HOST_PAGE_ALIGN(app_end);
- if (app_start < mmap_min_addr) {
- host_start = HOST_PAGE_ALIGN(mmap_min_addr);
- } else {
- host_start = app_start;
- if (host_start != app_start) {
- fprintf(stderr, "qemu: Address overflow loading ELF binary\n");
- abort();
- }
- }
- host_size = app_end - app_start;
- while (1) {
- /* Do not use mmap_find_vma here because that is limited to the
- guest address space. We are going to make the
- guest address space fit whatever we're given. */
- real_start = (unsigned long)mmap((void *)host_start, host_size,
- PROT_NONE, MAP_ANONYMOUS | MAP_PRIVATE | MAP_NORESERVE, -1, 0);
- if (real_start == (unsigned long)-1) {
- fprintf(stderr, "qemu: Virtual memory exausted\n");
- abort();
- }
- if (real_start == host_start) {
- break;
- }
- /* That address didn't work. Unmap and try a different one.
- The address the host picked because is typically
- right at the top of the host address space and leaves the
- guest with no usable address space. Resort to a linear search.
- We already compensated for mmap_min_addr, so this should not
- happen often. Probably means we got unlucky and host address
- space randomization put a shared library somewhere
- inconvenient. */
- munmap((void *)real_start, host_size);
- host_start += qemu_host_page_size;
- if (host_start == app_start) {
- /* Theoretically possible if host doesn't have any
- suitably aligned areas. Normally the first mmap will
- fail. */
- fprintf(stderr, "qemu: Unable to find space for application\n");
- abort();
- }
- }
- qemu_log("Relocating guest address space from 0x" TARGET_ABI_FMT_lx
- " to 0x%lx\n", app_start, real_start);
- guest_base = real_start - app_start;
+ fprintf(stderr, "%s: %s\n", bprm->filename, strerror(E2BIG));
+ exit(-1);
}
-#endif /* CONFIG_USE_GUEST_BASE */
/* Do this so that we can load the interpreter, if need be. We will
change some of these later */
- info->rss = 0;
bprm->p = setup_arg_pages(bprm->p, bprm, info);
- info->start_stack = bprm->p;
-
- /* Now we do a little grungy work by mmaping the ELF image into
- * the correct location in memory. At this point, we assume that
- * the image should be loaded at fixed address, not at a variable
- * address.
- */
-
- for(i = 0, elf_ppnt = elf_phdata; i < elf_ex.e_phnum; i++, elf_ppnt++) {
- int elf_prot = 0;
- int elf_flags = 0;
- abi_ulong error;
-
- if (elf_ppnt->p_type != PT_LOAD)
- continue;
-
- if (elf_ppnt->p_flags & PF_R) elf_prot |= PROT_READ;
- if (elf_ppnt->p_flags & PF_W) elf_prot |= PROT_WRITE;
- if (elf_ppnt->p_flags & PF_X) elf_prot |= PROT_EXEC;
- elf_flags = MAP_PRIVATE | MAP_DENYWRITE;
- if (elf_ex.e_type == ET_EXEC || load_addr_set) {
- elf_flags |= MAP_FIXED;
- } else if (elf_ex.e_type == ET_DYN) {
- /* Try and get dynamic programs out of the way of the default mmap
- base, as well as whatever program they might try to exec. This
- is because the brk will follow the loader, and is not movable. */
- /* NOTE: for qemu, we do a big mmap to get enough space
- without hardcoding any address */
- error = target_mmap(0, ET_DYN_MAP_SIZE,
- PROT_NONE, MAP_PRIVATE | MAP_ANON,
- -1, 0);
- if (error == -1) {
- perror("mmap");
- exit(-1);
- }
- load_bias = TARGET_ELF_PAGESTART(error - elf_ppnt->p_vaddr);
- }
-
- error = target_mmap(TARGET_ELF_PAGESTART(load_bias + elf_ppnt->p_vaddr),
- (elf_ppnt->p_filesz +
- TARGET_ELF_PAGEOFFSET(elf_ppnt->p_vaddr)),
- elf_prot,
- (MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE),
- bprm->fd,
- (elf_ppnt->p_offset -
- TARGET_ELF_PAGEOFFSET(elf_ppnt->p_vaddr)));
- if (error == -1) {
- perror("mmap");
- exit(-1);
- }
-
-#ifdef LOW_ELF_STACK
- if (TARGET_ELF_PAGESTART(elf_ppnt->p_vaddr) < elf_stack)
- elf_stack = TARGET_ELF_PAGESTART(elf_ppnt->p_vaddr);
-#endif
-
- if (!load_addr_set) {
- load_addr_set = 1;
- load_addr = elf_ppnt->p_vaddr - elf_ppnt->p_offset;
- if (elf_ex.e_type == ET_DYN) {
- load_bias += error -
- TARGET_ELF_PAGESTART(load_bias + elf_ppnt->p_vaddr);
- load_addr += load_bias;
- }
- }
- k = elf_ppnt->p_vaddr;
- if (k < start_code)
- start_code = k;
- if (start_data < k)
- start_data = k;
- k = elf_ppnt->p_vaddr + elf_ppnt->p_filesz;
- if ((elf_ppnt->p_flags & PF_X) && end_code < k)
- end_code = k;
- if (end_data < k)
- end_data = k;
- k = elf_ppnt->p_vaddr + elf_ppnt->p_memsz;
- if (k > elf_brk) {
- elf_brk = TARGET_PAGE_ALIGN(k);
- }
-
- /* If the load segment requests extra zeros (e.g. bss), map it. */
- if (elf_ppnt->p_filesz < elf_ppnt->p_memsz) {
- abi_ulong base = load_bias + elf_ppnt->p_vaddr;
- zero_bss(base + elf_ppnt->p_filesz,
- base + elf_ppnt->p_memsz, elf_prot);
- }
- }
-
- elf_entry += load_bias;
- elf_brk += load_bias;
- start_code += load_bias;
- end_code += load_bias;
- start_data += load_bias;
- end_data += load_bias;
-
- info->load_bias = load_bias;
- info->load_addr = load_addr;
- info->entry = elf_entry;
- info->start_brk = info->brk = elf_brk;
- info->end_code = end_code;
- info->start_code = start_code;
- info->start_data = start_data;
- info->end_data = end_data;
- info->personality = PER_LINUX;
-
- free(elf_phdata);
-
- if (qemu_log_enabled()) {
- load_symbols(&elf_ex, bprm->fd, load_bias);
- }
-
- close(bprm->fd);
if (elf_interpreter) {
load_elf_interp(elf_interpreter, &interp_info, bprm->buf);
@@ -1796,6 +1621,7 @@ int load_elf_binary(struct linux_binprm * bprm, struct target_pt_regs * regs,
if (elf_interpreter) {
info->load_addr = interp_info.load_addr;
info->entry = interp_info.entry;
+ free(elf_interpreter);
}
#ifdef USE_ELF_CORE_DUMP
--
cgit v0.8.3.4

View File

@ -0,0 +1,383 @@
Removed s390x pieces.
commit d979e8eb544da31df78bc76358a73f0d1c823c17
Author: Peter Maydell <peter.maydell@linaro.org>
Date: Mon Jun 27 17:44:51 2011 +0100
linux-user: Add syscall numbers from kernel 2.6.39.2
Add syscall numbers for new syscall numbers; this brings us
into line with Linux 2.6.39.2.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
diff --git a/linux-user/alpha/syscall_nr.h b/linux-user/alpha/syscall_nr.h
index e3127df..f6284db 100644
--- a/linux-user/alpha/syscall_nr.h
+++ b/linux-user/alpha/syscall_nr.h
@@ -411,4 +411,25 @@
#define TARGET_NR_signalfd 476
#define TARGET_NR_timerfd 477
#define TARGET_NR_eventfd 478
-
+#define TARGET_NR_recvmmsg 479
+#define TARGET_NR_fallocate 480
+#define TARGET_NR_timerfd_create 481
+#define TARGET_NR_timerfd_settime 482
+#define TARGET_NR_timerfd_gettime 483
+#define TARGET_NR_signalfd4 484
+#define TARGET_NR_eventfd2 485
+#define TARGET_NR_epoll_create1 486
+#define TARGET_NR_dup3 487
+#define TARGET_NR_pipe2 488
+#define TARGET_NR_inotify_init1 489
+#define TARGET_NR_preadv 490
+#define TARGET_NR_pwritev 491
+#define TARGET_NR_rt_tgsigqueueinfo 492
+#define TARGET_NR_perf_event_open 493
+#define TARGET_NR_fanotify_init 494
+#define TARGET_NR_fanotify_mark 495
+#define TARGET_NR_prlimit64 496
+#define TARGET_NR_name_to_handle_at 497
+#define TARGET_NR_open_by_handle_at 498
+#define TARGET_NR_clock_adjtime 499
+#define TARGET_NR_syncfs 500
diff --git a/linux-user/arm/syscall_nr.h b/linux-user/arm/syscall_nr.h
index 79a216a..7f05879 100644
--- a/linux-user/arm/syscall_nr.h
+++ b/linux-user/arm/syscall_nr.h
@@ -365,3 +365,16 @@
#define TARGET_NR_dup3 (358)
#define TARGET_NR_pipe2 (359)
#define TARGET_NR_inotify_init1 (360)
+#define TARGET_NR_preadv (361)
+#define TARGET_NR_pwritev (362)
+#define TARGET_NR_rt_tgsigqueueinfo (363)
+#define TARGET_NR_perf_event_open (364)
+#define TARGET_NR_recvmmsg (365)
+#define TARGET_NR_accept4 (366)
+#define TARGET_NR_fanotify_init (367)
+#define TARGET_NR_fanotify_mark (368)
+#define TARGET_NR_prlimit64 (369)
+#define TARGET_NR_name_to_handle_at (370)
+#define TARGET_NR_open_by_handle_at (371)
+#define TARGET_NR_clock_adjtime (372)
+#define TARGET_NR_syncfs (373)
diff --git a/linux-user/cris/syscall_nr.h b/linux-user/cris/syscall_nr.h
index 6132817..98f1a0b 100644
--- a/linux-user/cris/syscall_nr.h
+++ b/linux-user/cris/syscall_nr.h
@@ -333,3 +333,5 @@
#define TARGET_NR_dup3 330
#define TARGET_NR_pipe2 331
#define TARGET_NR_inotify_init1 332
+#define TARGET_NR_preadv 333
+#define TARGET_NR_pwritev 334
diff --git a/linux-user/i386/syscall_nr.h b/linux-user/i386/syscall_nr.h
index 3ef71ce..74abfca 100644
--- a/linux-user/i386/syscall_nr.h
+++ b/linux-user/i386/syscall_nr.h
@@ -335,3 +335,15 @@
#define TARGET_NR_dup3 330
#define TARGET_NR_pipe2 331
#define TARGET_NR_inotify_init1 332
+#define TARGET_NR_preadv 333
+#define TARGET_NR_pwritev 334
+#define TARGET_NR_rt_tgsigqueueinfo 335
+#define TARGET_NR_perf_event_open 336
+#define TARGET_NR_recvmmsg 337
+#define TARGET_NR_fanotify_init 338
+#define TARGET_NR_fanotify_mark 339
+#define TARGET_NR_prlimit64 340
+#define TARGET_NR_name_to_handle_at 341
+#define TARGET_NR_open_by_handle_at 342
+#define TARGET_NR_clock_adjtime 343
+#define TARGET_NR_syncfs 344
diff --git a/linux-user/m68k/syscall_nr.h b/linux-user/m68k/syscall_nr.h
index 1c0ba07..4d0937e 100644
--- a/linux-user/m68k/syscall_nr.h
+++ b/linux-user/m68k/syscall_nr.h
@@ -328,3 +328,19 @@
#define TARGET_NR_dup3 326
#define TARGET_NR_pipe2 327
#define TARGET_NR_inotify_init1 328
+#define TARGET_NR_inotify_init1 328
+#define TARGET_NR_preadv 329
+#define TARGET_NR_pwritev 330
+#define TARGET_NR_rt_tgsigqueueinfo 331
+#define TARGET_NR_perf_event_open 332
+#define TARGET_NR_get_thread_area 333
+#define TARGET_NR_set_thread_area 334
+#define TARGET_NR_atomic_cmpxchg_32 335
+#define TARGET_NR_atomic_barrier 336
+#define TARGET_NR_fanotify_init 337
+#define TARGET_NR_fanotify_mark 338
+#define TARGET_NR_prlimit64 339
+#define TARGET_NR_name_to_handle_at 340
+#define TARGET_NR_open_by_handle_at 341
+#define TARGET_NR_clock_adjtime 342
+#define TARGET_NR_syncfs 343
diff --git a/linux-user/main.c b/linux-user/main.c
index 289054b..48f0443 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -1985,6 +1985,33 @@ static const uint8_t mips_syscall_args[] = {
MIPS_SYS(sys_epoll_pwait, 6)
MIPS_SYS(sys_ioprio_set, 3)
MIPS_SYS(sys_ioprio_get, 2)
+ MIPS_SYS(sys_utimensat, 4)
+ MIPS_SYS(sys_signalfd, 3)
+ MIPS_SYS(sys_ni_syscall, 0) /* was timerfd */
+ MIPS_SYS(sys_eventfd, 1)
+ MIPS_SYS(sys_fallocate, 6) /* 4320 */
+ MIPS_SYS(sys_timerfd_create, 2)
+ MIPS_SYS(sys_timerfd_gettime, 2)
+ MIPS_SYS(sys_timerfd_settime, 4)
+ MIPS_SYS(sys_signalfd4, 4)
+ MIPS_SYS(sys_eventfd2, 2) /* 4325 */
+ MIPS_SYS(sys_epoll_create1, 1)
+ MIPS_SYS(sys_dup3, 3)
+ MIPS_SYS(sys_pipe2, 2)
+ MIPS_SYS(sys_inotify_init1, 1)
+ MIPS_SYS(sys_preadv, 6) /* 4330 */
+ MIPS_SYS(sys_pwritev, 6)
+ MIPS_SYS(sys_rt_tgsigqueueinfo, 4)
+ MIPS_SYS(sys_perf_event_open, 5)
+ MIPS_SYS(sys_accept4, 4)
+ MIPS_SYS(sys_recvmmsg, 5) /* 4335 */
+ MIPS_SYS(sys_fanotify_init, 2)
+ MIPS_SYS(sys_fanotify_mark, 6)
+ MIPS_SYS(sys_prlimit64, 4)
+ MIPS_SYS(sys_name_to_handle_at, 5)
+ MIPS_SYS(sys_open_by_handle_at, 3) /* 4340 */
+ MIPS_SYS(sys_clock_adjtime, 2)
+ MIPS_SYS(sys_syncfs, 1)
};
#undef MIPS_SYS
diff --git a/linux-user/microblaze/syscall_nr.h b/linux-user/microblaze/syscall_nr.h
index 3e641cd..f1fe0e7 100644
--- a/linux-user/microblaze/syscall_nr.h
+++ b/linux-user/microblaze/syscall_nr.h
@@ -364,6 +364,16 @@
#define TARGET_NR_sendmsg 360 /* new */
#define TARGET_NR_recvmsg 361 /* new */
#define TARGET_NR_accept04 362 /* new */
-
-#define TARGET_NR_syscalls 363
+#define TARGET_NR_preadv 363 /* new */
+#define TARGET_NR_pwritev 364 /* new */
+#define TARGET_NR_rt_tgsigqueueinfo 365 /* new */
+#define TARGET_NR_perf_event_open 366 /* new */
+#define TARGET_NR_recvmmsg 367 /* new */
+#define TARGET_NR_fanotify_init 368
+#define TARGET_NR_fanotify_mark 369
+#define TARGET_NR_prlimit64 370
+#define TARGET_NR_name_to_handle_at 371
+#define TARGET_NR_open_by_handle_at 372
+#define TARGET_NR_clock_adjtime 373
+#define TARGET_NR_syncfs 374
diff --git a/linux-user/mips/syscall_nr.h b/linux-user/mips/syscall_nr.h
index 0595308..fbdc348 100644
--- a/linux-user/mips/syscall_nr.h
+++ b/linux-user/mips/syscall_nr.h
@@ -332,3 +332,16 @@
#define TARGET_NR_dup3 (TARGET_NR_Linux + 327)
#define TARGET_NR_pipe2 (TARGET_NR_Linux + 328)
#define TARGET_NR_inotify_init1 (TARGET_NR_Linux + 329)
+#define TARGET_NR_preadv (TARGET_NR_Linux + 330)
+#define TARGET_NR_pwritev (TARGET_NR_Linux + 331)
+#define TARGET_NR_rt_tgsigqueueinfo (TARGET_NR_Linux + 332)
+#define TARGET_NR_perf_event_open (TARGET_NR_Linux + 333)
+#define TARGET_NR_accept4 (TARGET_NR_Linux + 334)
+#define TARGET_NR_recvmmsg (TARGET_NR_Linux + 335)
+#define TARGET_NR_fanotify_init (TARGET_NR_Linux + 336)
+#define TARGET_NR_fanotify_mark (TARGET_NR_Linux + 337)
+#define TARGET_NR_prlimit64 (TARGET_NR_Linux + 338)
+#define TARGET_NR_name_to_handle_at (TARGET_NR_Linux + 339)
+#define TARGET_NR_open_by_handle_at (TARGET_NR_Linux + 340)
+#define TARGET_NR_clock_adjtime (TARGET_NR_Linux + 341)
+#define TARGET_NR_syncfs (TARGET_NR_Linux + 342)
diff --git a/linux-user/mips64/syscall_nr.h b/linux-user/mips64/syscall_nr.h
index ee1d134..36d27b5 100644
--- a/linux-user/mips64/syscall_nr.h
+++ b/linux-user/mips64/syscall_nr.h
@@ -291,3 +291,16 @@
#define TARGET_NR_dup3 (TARGET_NR_Linux + 286)
#define TARGET_NR_pipe2 (TARGET_NR_Linux + 287)
#define TARGET_NR_inotify_init1 (TARGET_NR_Linux + 288)
+#define TARGET_NR_preadv (TARGET_NR_Linux + 289)
+#define TARGET_NR_pwritev (TARGET_NR_Linux + 290)
+#define TARGET_NR_rt_tgsigqueueinfo (TARGET_NR_Linux + 291)
+#define TARGET_NR_perf_event_open (TARGET_NR_Linux + 292)
+#define TARGET_NR_accept4 (TARGET_NR_Linux + 293)
+#define TARGET_NR_recvmmsg (TARGET_NR_Linux + 294)
+#define TARGET_NR_fanotify_init (TARGET_NR_Linux + 295)
+#define TARGET_NR_fanotify_mark (TARGET_NR_Linux + 296)
+#define TARGET_NR_prlimit64 (TARGET_NR_Linux + 297)
+#define TARGET_NR_name_to_handle_at (TARGET_NR_Linux + 298)
+#define TARGET_NR_open_by_handle_at (TARGET_NR_Linux + 299)
+#define TARGET_NR_clock_adjtime (TARGET_NR_Linux + 300)
+#define TARGET_NR_syncfs (TARGET_NR_Linux + 301)
diff --git a/linux-user/mipsn32/syscall_nr.h b/linux-user/mipsn32/syscall_nr.h
index 60a99dd..4e1aca3 100644
--- a/linux-user/mipsn32/syscall_nr.h
+++ b/linux-user/mipsn32/syscall_nr.h
@@ -295,3 +295,17 @@
#define TARGET_NR_dup3 (TARGET_NR_Linux + 290)
#define TARGET_NR_pipe2 (TARGET_NR_Linux + 291)
#define TARGET_NR_inotify_init1 (TARGET_NR_Linux + 292)
+#define TARGET_NR_preadv (TARGET_NR_Linux + 293)
+#define TARGET_NR_pwritev (TARGET_NR_Linux + 294)
+#define TARGET_NR_rt_tgsigqueueinfo (TARGET_NR_Linux + 295)
+#define TARGET_NR_perf_event_open (TARGET_NR_Linux + 296)
+#define TARGET_NR_accept4 (TARGET_NR_Linux + 297)
+#define TARGET_NR_recvmmsg (TARGET_NR_Linux + 298)
+#define TARGET_NR_getdents64 (TARGET_NR_Linux + 299)
+#define TARGET_NR_fanotify_init (TARGET_NR_Linux + 300)
+#define TARGET_NR_fanotify_mark (TARGET_NR_Linux + 301)
+#define TARGET_NR_prlimit64 (TARGET_NR_Linux + 302)
+#define TARGET_NR_name_to_handle_at (TARGET_NR_Linux + 303)
+#define TARGET_NR_open_by_handle_at (TARGET_NR_Linux + 304)
+#define TARGET_NR_clock_adjtime (TARGET_NR_Linux + 305)
+#define TARGET_NR_syncfs (TARGET_NR_Linux + 306)
diff --git a/linux-user/ppc/syscall_nr.h b/linux-user/ppc/syscall_nr.h
index cc84a4c..0673b7d 100644
--- a/linux-user/ppc/syscall_nr.h
+++ b/linux-user/ppc/syscall_nr.h
@@ -332,3 +332,33 @@
#define TARGET_NR_dup3 316
#define TARGET_NR_pipe2 317
#define TARGET_NR_inotify_init1 318
+#define TARGET_NR_perf_event_open 319
+#define TARGET_NR_preadv 320
+#define TARGET_NR_pwritev 321
+#define TARGET_NR_rt_tgsigqueueinfo 322
+#define TARGET_NR_fanotify_init 323
+#define TARGET_NR_fanotify_mark 324
+#define TARGET_NR_prlimit64 325
+#define TARGET_NR_socket 326
+#define TARGET_NR_bind 327
+#define TARGET_NR_connect 328
+#define TARGET_NR_listen 329
+#define TARGET_NR_accept 330
+#define TARGET_NR_getsockname 331
+#define TARGET_NR_getpeername 332
+#define TARGET_NR_socketpair 333
+#define TARGET_NR_send 334
+#define TARGET_NR_sendto 335
+#define TARGET_NR_recv 336
+#define TARGET_NR_recvfrom 337
+#define TARGET_NR_shutdown 338
+#define TARGET_NR_setsockopt 339
+#define TARGET_NR_getsockopt 340
+#define TARGET_NR_sendmsg 341
+#define TARGET_NR_recvmsg 342
+#define TARGET_NR_recvmmsg 343
+#define TARGET_NR_accept4 344
+#define TARGET_NR_name_to_handle_at 345
+#define TARGET_NR_open_by_handle_at 346
+#define TARGET_NR_clock_adjtime 347
+#define TARGET_NR_syncfs 348
diff --git a/linux-user/sh4/syscall_nr.h b/linux-user/sh4/syscall_nr.h
index 262b236..6173a7c 100644
--- a/linux-user/sh4/syscall_nr.h
+++ b/linux-user/sh4/syscall_nr.h
@@ -334,3 +334,35 @@
#define TARGET_NR_dup3 330
#define TARGET_NR_pipe2 331
#define TARGET_NR_inotify_init1 332
+#define TARGET_NR_preadv 333
+#define TARGET_NR_pwritev 334
+#define TARGET_NR_rt_tgsigqueueinfo 335
+#define TARGET_NR_perf_event_open 336
+#define TARGET_NR_fanotify_init 337
+#define TARGET_NR_fanotify_mark 338
+#define TARGET_NR_prlimit64 339
+
+/* Non-multiplexed socket family */
+#define TARGET_NR_socket 340
+#define TARGET_NR_bind 341
+#define TARGET_NR_connect 342
+#define TARGET_NR_listen 343
+#define TARGET_NR_accept 344
+#define TARGET_NR_getsockname 345
+#define TARGET_NR_getpeername 346
+#define TARGET_NR_socketpair 347
+#define TARGET_NR_send 348
+#define TARGET_NR_sendto 349
+#define TARGET_NR_recv 350
+#define TARGET_NR_recvfrom 351
+#define TARGET_NR_shutdown 352
+#define TARGET_NR_setsockopt 353
+#define TARGET_NR_getsockopt 354
+#define TARGET_NR_sendmsg 355
+#define TARGET_NR_recvmsg 356
+#define TARGET_NR_recvmmsg 357
+#define TARGET_NR_accept4 358
+#define TARGET_NR_name_to_handle_at 359
+#define TARGET_NR_open_by_handle_at 360
+#define TARGET_NR_clock_adjtime 361
+#define TARGET_NR_syncfs 362
diff --git a/linux-user/sparc/syscall_nr.h b/linux-user/sparc/syscall_nr.h
index 5d1ac21..be503f2 100644
--- a/linux-user/sparc/syscall_nr.h
+++ b/linux-user/sparc/syscall_nr.h
@@ -285,3 +285,15 @@
#define TARGET_NR_pipe2 321
#define TARGET_NR_inotify_init1 322
#define TARGET_NR_accept4 323
+#define TARGET_NR_preadv 324
+#define TARGET_NR_pwritev 325
+#define TARGET_NR_rt_tgsigqueueinfo 326
+#define TARGET_NR_perf_event_open 327
+#define TARGET_NR_recvmmsg 328
+#define TARGET_NR_fanotify_init 329
+#define TARGET_NR_fanotify_mark 330
+#define TARGET_NR_prlimit64 331
+#define TARGET_NR_name_to_handle_at 332
+#define TARGET_NR_open_by_handle_at 333
+#define TARGET_NR_clock_adjtime 334
+#define TARGET_NR_syncfs 335
diff --git a/linux-user/sparc64/syscall_nr.h b/linux-user/sparc64/syscall_nr.h
index bdca2a7..70988b2 100644
--- a/linux-user/sparc64/syscall_nr.h
+++ b/linux-user/sparc64/syscall_nr.h
@@ -322,3 +322,15 @@
#define TARGET_NR_pipe2 321
#define TARGET_NR_inotify_init1 322
#define TARGET_NR_accept4 323
+#define TARGET_NR_preadv 324
+#define TARGET_NR_pwritev 325
+#define TARGET_NR_rt_tgsigqueueinfo 326
+#define TARGET_NR_perf_event_open 327
+#define TARGET_NR_recvmmsg 328
+#define TARGET_NR_fanotify_init 329
+#define TARGET_NR_fanotify_mark 330
+#define TARGET_NR_prlimit64 331
+#define TARGET_NR_name_to_handle_at 332
+#define TARGET_NR_open_by_handle_at 333
+#define TARGET_NR_clock_adjtime 334
+#define TARGET_NR_syncfs 335
diff --git a/linux-user/x86_64/syscall_nr.h b/linux-user/x86_64/syscall_nr.h
index 568a901..947e961 100644
--- a/linux-user/x86_64/syscall_nr.h
+++ b/linux-user/x86_64/syscall_nr.h
@@ -293,3 +293,15 @@
#define TARGET_NR_dup3 292
#define TARGET_NR_pipe2 293
#define TARGET_NR_inotify_init1 294
+#define TARGET_NR_preadv 295
+#define TARGET_NR_pwritev 296
+#define TARGET_NR_rt_tgsigqueueinfo 297
+#define TARGET_NR_perf_event_open 298
+#define TARGET_NR_recvmmsg 299
+#define TARGET_NR_fanotify_init 300
+#define TARGET_NR_fanotify_mark 301
+#define TARGET_NR_prlimit64 302
+#define TARGET_NR_name_to_handle_at 303
+#define TARGET_NR_open_by_handle_at 304
+#define TARGET_NR_clock_adjtime 305
+#define TARGET_NR_syncfs 306

View File

@ -1,15 +1,8 @@
DIST VMware-player-2.0.5-109488.i386.tar.gz 68597946 RMD160 4277dd999081756512f91382dd1245585848bc90 SHA1 5bb6c0c2f9ef46651998a27a435bd176d6305129 SHA256 adcda2151465fb6f21b4579fb63d4badeb1e29a024f982fd7561562a07369955
DIST VMware-player-2.0.5-109488.x86_64.tar.gz 33383867 RMD160 de53fd58eb3fbe6b868b5f5e691e62943dc7d413 SHA1 d5d79d3beb13caa9f05f01517bc09ac4ba7b4dd1 SHA256 f5e6c53f91d9cdb2eb39442dbb97f1d5edc110c17bfe8cc91f235f0188b658b2
DIST VMware-server-1.0.10-203137.tar.gz 107183610 RMD160 0ddaa6a6f5b3c08804eb1b97f13ffd0fc0b87876 SHA1 f21ed65a500b2176166d90ed2821892ce1cb1fd5 SHA256 744d6057daeea5f9a950d164a3d9c5ca6273feed645699cfcf16d8acbcfa504c
DIST vmware-modules-138.10-genpatches-9.tar.bz2 16140 RMD160 b89d6e5ad29f5598ec1621a58adf9d7e3ce5b2da SHA1 abeff89ebfee7e7c3f507011424c604174c9c524 SHA256 dd76641bcfcc4de582c0a654bd217a387b7ac66316d8b3e49e55ac8fa689410a
DIST vmware-modules-169.5-genpatches-4.tar.bz2 8933 RMD160 1b92bac0c563d95b4d124c051b0b7d02afe317b9 SHA1 c83f909807e38a85cdd76707eaad1afa65284ce6 SHA256 db48fb849f4712b17f462a2a4fb1156b0182c24753db53321a8403b54aca2de4
DIST vmware-modules-208.2-genpatches-4.tar.bz2 9889 RMD160 647653404969a7548abdb5f29e4044622660f97c SHA1 f275177edab2f0bf8f33a9403da5f58ed8b848ea SHA256 789bf828548a8a885d435a997ca669746334b3a14ea680fcdd3d73f7d801dbd2
DIST vmware-modules-208.2.tar.bz2 480598 RMD160 ad26e45f71c35eb0615a8c609ab2de524140368d SHA1 ab6d5eb19e31f83adc5ce352732539746333b2d7 SHA256 0a31b5a2b49f26a433271e2505879f6a4b713617c6300ec2f6b302c6484de50c
DIST vmware-modules-209.3-genpatches-4.tar.bz2 5205 RMD160 afb2a6d9bf5866eea879ed02d1bbcfa8a4207d23 SHA1 254004680525838d2d89284442c0a26d3b3f90ae SHA256 05c0ade612544cf36d7e19ce6b696184eca6a7cf1070e954ac741909cf5c7b09
DIST vmware-modules-209.3.tar.bz2 486848 RMD160 6e8bafbf9a2ce8702020e3e0963650251fc7b6ca SHA1 8725ade0b56f9bf682cc6a30fe6661441075adc5 SHA256 7d3b609b1fa3758b52500ea4a3f8c6d42909b907c4f3901e494358585237b182
EBUILD vmware-modules-138.10.ebuild 373 RMD160 bf56f55344f849227a966ee37f7bb4229c2ff804 SHA1 1a02cfb866f99c7505538f49b6ac9b8d5f1be5d7 SHA256 c80f184f19c26d56b5b9f167932ffb8ab988b9db9af3a82104f14620939147cd
EBUILD vmware-modules-169.5.ebuild 485 RMD160 67dad5ba14a68b57c0774da79db4b9d22b47849a SHA1 2a1f71591fdb561cb1c5b7682f0fac9f33c2f004 SHA256 d8f37ae493dad7964fbef5f16edeedf31bb88d42438e54fc9104e0eb6011b214
EBUILD vmware-modules-208.2.ebuild 253 RMD160 9ab6d2b2927139eeb164c07f02832745049404cb SHA1 0f1b637de0ff53be57af3b5033010c698d34617c SHA256 3b6aa82f3fb41fc082253c653243298d73eb0b11a97e23d0b286ee5a752d398f
EBUILD vmware-modules-209.3.ebuild 253 RMD160 0f3225156529af0bf784923edc2f302233f872af SHA1 26fe48e1d5c3184d13598a47f76ec7e9297e7590 SHA256 d1a9e5434ba20c2207a83a6dec45563c83c4f0d78abfe7e12acffe067084d686
MISC ChangeLog 3450 RMD160 8f334c704a81aeff5d130b176a48a1ac51991c3e SHA1 2f77b433164c95f7d7580ff3dddc6c1f603b56f7 SHA256 10747a384978518e80c1910bca6762803b59150d36060324befebaafb50a0866
MISC metadata.xml 275 RMD160 154f03a8c1609d6def214591fba5fb21fb0e00d2 SHA1 2f417ba75e904dee8931b083e2ddcde63a5e8a41 SHA256 a975784c2f6a76d8f7b75f898bb52392fd2fff9f26bcff162e9cc4c977464cb6

View File

@ -1,17 +0,0 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
GENPATCHES_VER="4"
VM_SRC_URI="x86? ( mirror://vmware/software/vmplayer/VMware-player-2.0.5-109488.i386.tar.gz )
amd64? ( mirror://vmware/software/vmplayer/VMware-player-2.0.5-109488.x86_64.tar.gz )"
VM_MODULE_LIST="vmmon vmnet vmblock"
inherit vmware-mod-2
KEYWORDS="~amd64 ~x86"
IUSE=""
S="${WORKDIR}"/vmware-player-distrib/lib/modules/source/

View File

@ -1,14 +0,0 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI="2"
GENPATCHES_VER="4"
VM_MODULE_LIST="vmmon vmnet vmblock vmci vsock"
inherit vmware-mod-2
KEYWORDS="~amd64 ~x86"
IUSE=""

View File

@ -1,596 +0,0 @@
# ChangeLog for app-emulation/vmware-player
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/ChangeLog,v 1.79 2009/09/25 10:37:05 maekke Exp $
25 Sep 2009; Markus Meier <maekke@gentoo.org>
vmware-player-2.5.3.185404.ebuild:
amd64 stable, bug #282213
25 Aug 2009; Christian Faulhammer <fauli@gentoo.org>
vmware-player-2.5.3.185404.ebuild:
stable x86, security bug 282213
22 Aug 2009; Vadim Kuznetsov vadimk@gentoo.org
vmware-player-2.5.3.185404.ebuild:
Added pkg_prerm for safe unmerge
*vmware-player-2.5.3.185404 (22 Aug 2009)
22 Aug 2009; Vadim Kuznetsov vadimk@gentoo.org
+files/vmware-player-2.5.3.185404-installer.patch,
+files/2.5.3.185404/vmware-player.py.patch,
+files/2.5.3.185404/vmware-player-extras.py.patch,
+vmware-player-2.5.3.185404.ebuild:
Version bump. Bug 282213.
30 Jul 2009; Markus Meier <maekke@gentoo.org>
vmware-player-2.5.2.156735.ebuild:
amd64 stable, bug #265139
*vmware-player-2.5.2.156735-r1 (14 Jun 2009)
14 Jun 2009; Vadim Kuznetsov vadimk@gentoo.org
+vmware-player-2.5.2.156735-r1.ebuild, metadata.xml:
Bugs 268695, 273750.
05 May 2009; Christian Faulhammer <fauli@gentoo.org>
vmware-player-2.5.2.156735.ebuild:
stable x86, bug 265139
*vmware-player-2.5.2.156735 (06 Apr 2009)
06 Apr 2009; Mike Auty <ikelos@gentoo.org>
+files/2.5.2.156735/vmware-player.py.patch,
+files/vmware-player-2.5.2.156735-installer.patch,
+files/2.5.2.156735/vmware-player-extras.py.patch,
+vmware-player-2.5.2.156735.ebuild:
Version bump vmware-player-2.5.2-156735.
25 Mar 2009; Mike Auty <ikelos@gentoo.org>
vmware-player-2.5.1.126130.ebuild:
gtkmm's accessibility is now always enabled (see bug #247249)
12 Mar 2009; Diego E. Pettenò <flameeyes@gentoo.org>
vmware-player-2.5.1.126130.ebuild:
Remove binchecks restriction (package installs binaries!).
22 Feb 2009; Mike Auty <ikelos@gentoo.org>
-files/2.5.0.118166/vmware-player.py.patch,
-files/2.5.0.118166/vmware-player-extras.py.patch,
-files/vmware-player-2.5.0.118166-installer.patch,
-files/1.0.7.91707/000_all_initd-location.patch,
-files/1.0.7.91707/001_all_fix-permissions.patch,
-files/1.0.7.91707/002_all_pagebreak-detection-fix.patch,
-files/1.0.7.91707/004_all_do-not-build-modules.patch,
-files/1.0.7.91707/007_all_use-modprobe-over-insmod.patch,
-files/1.0.7.91707/009_all_init.d-modules-warning.patch,
-files/1.0.8.108000/000_all_initd-location.patch,
-files/1.0.8.108000/001_all_fix-permissions.patch,
-files/1.0.8.108000/002_all_pagebreak-detection-fix.patch,
-files/1.0.8.108000/004_all_do-not-build-modules.patch,
-files/1.0.8.108000/007_all_use-modprobe-over-insmod.patch,
-files/1.0.8.108000/009_all_init.d-modules-warning.patch,
-files/2.0.4.93057/000_all_initd-location.patch,
-files/2.0.4.93057/001_all_fix-permissions.patch,
-files/2.0.4.93057/002_all_pagebreak-detection-fix.patch,
-files/2.0.4.93057/004_all_do-not-build-modules.patch,
-files/2.0.4.93057/007_all_use-modprobe-over-insmod.patch,
-files/2.0.4.93057/009_all_init.d-modules-warning.patch,
-files/2.0.4.93057/011_all_legit-modules-only.patch,
-files/2.0.5.109488/000_all_initd-location.patch,
-files/2.0.5.109488/001_all_fix-permissions.patch,
-files/2.0.5.109488/002_all_pagebreak-detection-fix.patch,
-files/2.0.5.109488/004_all_do-not-build-modules.patch,
-files/2.0.5.109488/007_all_use-modprobe-over-insmod.patch,
-files/2.0.5.109488/009_all_init.d-modules-warning.patch,
-files/2.0.5.109488/011_all_legit-modules-only.patch,
-vmware-player-1.0.7.91707.ebuild, -vmware-player-1.0.8.108000.ebuild,
-vmware-player-2.0.4.93057.ebuild, -vmware-player-2.0.5.109488.ebuild,
-vmware-player-2.5.0.118166.ebuild:
Clear out old insecure versions of vmware-player (bug 245941).
12 Jan 2009; Markus Meier <maekke@gentoo.org>
vmware-player-1.0.9.126128.ebuild, vmware-player-2.5.1.126130.ebuild:
amd64/x86 stable, bug #245941
11 Jan 2009; Markus Meier <maekke@gentoo.org>
vmware-player-1.0.8.108000.ebuild:
amd64/x86 stable, bug #236167
05 Jan 2009; Rémi Cardona <remi@gentoo.org>
vmware-player-2.5.1.126130.ebuild:
Change virtual/xft dependency to x11-libs/libXft, bug 253771.
04 Jan 2009; Ulrich Mueller <ulm@gentoo.org>
vmware-player-1.0.7.91707.ebuild, vmware-player-1.0.8.108000.ebuild,
vmware-player-1.0.9.126128.ebuild, vmware-player-2.0.4.93057.ebuild,
vmware-player-2.0.5.109488.ebuild, vmware-player-2.5.0.118166.ebuild:
Change virtual/xft dependency to x11-libs/libXft, bug 253771.
31 Dec 2008; Mike Auty <ikelos@gentoo.org>
vmware-player-2.5.0.118166.ebuild, vmware-player-2.5.1.126130.ebuild:
Depend on >=libview-0.6.2, fixes bug 247138.
*vmware-player-2.5.1.126130 (31 Dec 2008)
31 Dec 2008; Mike Auty <ikelos@gentoo.org>
+files/2.5.1.126130/vmware-player.py.patch,
+files/vmware-player-2.5.1.126130-installer.patch,
+files/2.5.1.126130/vmware-player-extras.py.patch,
+vmware-player-2.5.1.126130.ebuild:
Version bump vmware-player to 2.5.1.
27 Nov 2008; Mike Auty <ikelos@gentoo.org> files/helpers/vmware-config.sh:
Fix up vmware-config.sh helper (bug 246854).
17 Nov 2008; Mike Auty <ikelos@gentoo.org>
vmware-player-2.5.0.118166.ebuild:
Fix up missing ncurses USE dep, and clarify not-in-screen message.
10 Nov 2008; Mike Auty <ikelos@gentoo.org>
vmware-player-2.5.0.118166.ebuild:
Ensure it dies properly and put in a better check for screen.
10 Nov 2008; Mike Auty <ikelos@gentoo.org>
+files/2.5.0.118166/vmware-player.py.patch,
+files/2.5.0.118166/vmware-player-extras.py.patch:
Make sure the patches are in place (bug 246252).
*vmware-player-2.5.0.118166 (09 Nov 2008)
*vmware-player-1.0.9.126128 (09 Nov 2008)
09 Nov 2008; Mike Auty <ikelos@gentoo.org>
+files/1.0.9.126128/000_all_initd-location.patch,
+files/1.0.9.126128/007_all_use-modprobe-over-insmod.patch,
+files/1.0.9.126128/001_all_fix-permissions.patch,
+files/1.0.9.126128/009_all_init.d-modules-warning.patch,
+files/vmware-player-2.5.0.118166-installer.patch,
+files/1.0.9.126128/002_all_pagebreak-detection-fix.patch,
+files/2.5.0.118166/vmware-player.py.patch, +files/vmware-player-2.5.rc,
+files/1.0.9.126128/004_all_do-not-build-modules.patch,
+files/2.5.0.118166/vmware-player-extras.py.patch,
+files/helpers/module_patcher.sh, +files/helpers/unbundler.sh,
+files/helpers/vmware-config.sh, +vmware-player-1.0.9.126128.ebuild,
+vmware-player-2.5.0.118166.ebuild:
Bump to 1.0.9 and introduce 2.5.0 for bug 245941.
*vmware-player-2.0.5.109488 (30 Sep 2008)
*vmware-player-1.0.8.108000 (30 Sep 2008)
30 Sep 2008; Mike Auty <ikelos@gentoo.org>
-files/1.0.6.80404/000_all_initd-location.patch,
-files/1.0.6.80404/001_all_fix-permissions.patch,
-files/1.0.6.80404/002_all_pagebreak-detection-fix.patch,
-files/1.0.6.80404/004_all_do-not-build-modules.patch,
-files/1.0.6.80404/007_all_use-modprobe-over-insmod.patch,
-files/1.0.6.80404/009_all_init.d-modules-warning.patch,
+files/1.0.8.108000/000_all_initd-location.patch,
+files/1.0.8.108000/001_all_fix-permissions.patch,
+files/1.0.8.108000/002_all_pagebreak-detection-fix.patch,
+files/1.0.8.108000/004_all_do-not-build-modules.patch,
+files/1.0.8.108000/007_all_use-modprobe-over-insmod.patch,
+files/1.0.8.108000/009_all_init.d-modules-warning.patch,
-files/2.0.3.80004/000_all_initd-location.patch,
-files/2.0.3.80004/001_all_fix-permissions.patch,
-files/2.0.3.80004/002_all_pagebreak-detection-fix.patch,
-files/2.0.3.80004/004_all_do-not-build-modules.patch,
-files/2.0.3.80004/007_all_use-modprobe-over-insmod.patch,
-files/2.0.3.80004/009_all_init.d-modules-warning.patch,
-files/2.0.3.80004/011_all_legit-modules-only.patch,
+files/2.0.5.109488/000_all_initd-location.patch,
+files/2.0.5.109488/001_all_fix-permissions.patch,
+files/2.0.5.109488/002_all_pagebreak-detection-fix.patch,
+files/2.0.5.109488/004_all_do-not-build-modules.patch,
+files/2.0.5.109488/007_all_use-modprobe-over-insmod.patch,
+files/2.0.5.109488/009_all_init.d-modules-warning.patch,
+files/2.0.5.109488/011_all_legit-modules-only.patch,
-vmware-player-1.0.6.80404.ebuild, +vmware-player-1.0.8.108000.ebuild,
-vmware-player-2.0.3.80004.ebuild, +vmware-player-2.0.5.109488.ebuild:
Version bump 1.0.8 and 2.0.5.
03 Jul 2008; Christian Faulhammer <opfer@gentoo.org>
vmware-player-1.0.7.91707.ebuild:
stable x86, security bug 224637
22 Jun 2008; Markus Meier <maekke@gentoo.org>
vmware-player-1.0.7.91707.ebuild:
amd64 stable, bug #224637
16 Jun 2008; Christian Faulhammer <opfer@gentoo.org> ChangeLog:
app-emulation/vmware-workstation-5.5.7.91707 stable, bug #x86
*vmware-player-2.0.4.93057 (14 Jun 2008)
*vmware-player-1.0.7.91707 (14 Jun 2008)
14 Jun 2008; Mike Auty <ikelos@gentoo.org>
-files/1.0.5.56455/000_all_initd-location.patch,
-files/1.0.5.56455/001_all_fix-permissions.patch,
-files/1.0.5.56455/002_all_pagebreak-detection-fix.patch,
-files/1.0.5.56455/004_all_do-not-build-modules.patch,
-files/1.0.5.56455/007_all_use-modprobe-over-insmod.patch,
-files/1.0.5.56455/009_all_init.d-modules-warning.patch,
+files/1.0.7.91707/000_all_initd-location.patch,
+files/1.0.7.91707/001_all_fix-permissions.patch,
+files/1.0.7.91707/002_all_pagebreak-detection-fix.patch,
+files/1.0.7.91707/004_all_do-not-build-modules.patch,
+files/1.0.7.91707/007_all_use-modprobe-over-insmod.patch,
+files/1.0.7.91707/009_all_init.d-modules-warning.patch,
-files/2.0.1.55017/000_all_initd-location.patch,
-files/2.0.1.55017/001_all_fix-permissions.patch,
-files/2.0.1.55017/002_all_pagebreak-detection-fix.patch,
-files/2.0.1.55017/004_all_do-not-build-modules.patch,
-files/2.0.1.55017/007_all_use-modprobe-over-insmod.patch,
-files/2.0.1.55017/009_all_init.d-modules-warning.patch,
-files/2.0.1.55017/011_all_legit-modules-only.patch,
-files/2.0.2.59824/000_all_initd-location.patch,
-files/2.0.2.59824/001_all_fix-permissions.patch,
-files/2.0.2.59824/002_all_pagebreak-detection-fix.patch,
-files/2.0.2.59824/004_all_do-not-build-modules.patch,
-files/2.0.2.59824/007_all_use-modprobe-over-insmod.patch,
-files/2.0.2.59824/009_all_init.d-modules-warning.patch,
-files/2.0.2.59824/011_all_legit-modules-only.patch,
+files/2.0.4.93057/000_all_initd-location.patch,
+files/2.0.4.93057/001_all_fix-permissions.patch,
+files/2.0.4.93057/002_all_pagebreak-detection-fix.patch,
+files/2.0.4.93057/004_all_do-not-build-modules.patch,
+files/2.0.4.93057/007_all_use-modprobe-over-insmod.patch,
+files/2.0.4.93057/009_all_init.d-modules-warning.patch,
+files/2.0.4.93057/011_all_legit-modules-only.patch,
-vmware-player-1.0.5.56455.ebuild, +vmware-player-1.0.7.91707.ebuild,
-vmware-player-2.0.1.55017.ebuild, -vmware-player-2.0.2.59824.ebuild,
+vmware-player-2.0.4.93057.ebuild:
Version bump for bug 224637. Also clear out old versions.
12 May 2008; Markus Meier <maekke@gentoo.org>
vmware-player-1.0.6.80404.ebuild:
amd64 stable, bug #213548
07 May 2008; Christian Faulhammer <opfer@gentoo.org>
vmware-player-1.0.6.80404.ebuild:
stable x86, bug 213548
26 Apr 2008; Mike Auty <ikelos@gentoo.org> files/vmware-player.rc:
Add hald to the init use requirements (bug 206468).
26 Apr 2008; Mike Auty <ikelos@gentoo.org>
vmware-player-2.0.3.80004.ebuild:
Merge dependencies for vmware-player-2.0.3 x86 and amd64 arches.
*vmware-player-2.0.3.80004 (22 Mar 2008)
*vmware-player-1.0.6.80404 (22 Mar 2008)
22 Mar 2008; Mike Auty <ikelos@gentoo.org>
+files/1.0.6.80404/000_all_initd-location.patch,
+files/1.0.6.80404/002_all_pagebreak-detection-fix.patch,
+files/2.0.3.80004/000_all_initd-location.patch,
+files/1.0.6.80404/001_all_fix-permissions.patch,
+files/1.0.6.80404/004_all_do-not-build-modules.patch,
+files/1.0.6.80404/007_all_use-modprobe-over-insmod.patch,
+files/1.0.6.80404/009_all_init.d-modules-warning.patch,
+files/2.0.3.80004/001_all_fix-permissions.patch,
+files/2.0.3.80004/002_all_pagebreak-detection-fix.patch,
+files/2.0.3.80004/004_all_do-not-build-modules.patch,
+files/2.0.3.80004/007_all_use-modprobe-over-insmod.patch,
+files/2.0.3.80004/009_all_init.d-modules-warning.patch,
+files/2.0.3.80004/011_all_legit-modules-only.patch,
+vmware-player-1.0.6.80404.ebuild, +vmware-player-2.0.3.80004.ebuild:
Version bump 1.0.6 and 2.0.3, to fix bug 213548.
31 Jan 2008; Mike Auty <ikelos@gentoo.org> ChangeLog:
Re-sign digestless manifest.
26 Jan 2008; Mike Auty <ikelos@gentoo.org>
files/digest-vmware-player-1.0.5.56455,
files/digest-vmware-player-2.0.1.55017,
files/digest-vmware-player-2.0.2.59824, Manifest:
Redigest for any-any-update115.
*vmware-player-2.0.2.59824 (25 Nov 2007)
25 Nov 2007; Mike Auty <ikelos@gentoo.org>
+files/2.0.2.59824/000_all_initd-location.patch,
+files/2.0.2.59824/001_all_fix-permissions.patch,
+files/2.0.2.59824/002_all_pagebreak-detection-fix.patch,
+files/2.0.2.59824/004_all_do-not-build-modules.patch,
+files/2.0.2.59824/007_all_use-modprobe-over-insmod.patch,
+files/2.0.2.59824/009_all_init.d-modules-warning.patch,
+files/2.0.2.59824/011_all_legit-modules-only.patch,
files/vmware-player.rc, +vmware-player-2.0.2.59824.ebuild:
Version bump to 2.0.2, and update to vmware-any-any-update114.
06 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org>
-files/1.0.2.29634/000_all_initd-location.patch,
-files/1.0.2.29634/001_all_fix-permissions.patch,
-files/1.0.2.29634/002_all_pagebreak-detection-fix.patch,
-files/1.0.2.29634/004_all_do-not-build-modules.patch,
-files/1.0.2.29634/007_all_use-modprobe-over-insmod.patch,
-files/1.0.2.29634/009_all_init.d-modules-warning.patch,
-files/1.0.3.34682/000_all_initd-location.patch,
-files/1.0.3.34682/001_all_fix-permissions.patch,
-files/1.0.3.34682/002_all_pagebreak-detection-fix.patch,
-files/1.0.3.34682/004_all_do-not-build-modules.patch,
-files/1.0.3.34682/007_all_use-modprobe-over-insmod.patch,
-files/1.0.3.34682/009_all_init.d-modules-warning.patch,
-files/2.0.0.45731/000_all_initd-location.patch,
-files/2.0.0.45731/001_all_fix-permissions.patch,
-files/2.0.0.45731/002_all_pagebreak-detection-fix.patch,
-files/2.0.0.45731/004_all_do-not-build-modules.patch,
-files/2.0.0.45731/007_all_use-modprobe-over-insmod.patch,
-files/2.0.0.45731/009_all_init.d-modules-warning.patch,
-vmware-player-1.0.2.29634.ebuild, -vmware-player-1.0.3.34682-r1.ebuild,
-vmware-player-2.0.0.45731.ebuild:
Cleaning up older versions.
06 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-player-1.0.5.56455.ebuild:
Stable on amd64 wrt bug #193196.
*vmware-player-2.0.1.55017 (14 Oct 2007)
14 Oct 2007; Mike Auty <ikelos@gentoo.org>
+files/2.0.1.55017/000_all_initd-location.patch,
+files/2.0.1.55017/001_all_fix-permissions.patch,
+files/2.0.1.55017/002_all_pagebreak-detection-fix.patch,
+files/2.0.1.55017/004_all_do-not-build-modules.patch,
+files/2.0.1.55017/007_all_use-modprobe-over-insmod.patch,
+files/2.0.1.55017/009_all_init.d-modules-warning.patch,
+files/2.0.1.55017/011_all_legit-modules-only.patch,
+vmware-player-2.0.1.55017.ebuild:
Version bump to vmware-player-2.0.1, fixes some security bugs.
23 Sep 2007; Christian Faulhammer <opfer@gentoo.org>
vmware-player-1.0.5.56455.ebuild:
stable x86, security bug 193196
*vmware-player-1.0.5.56455 (21 Sep 2007)
21 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+files/1.0.5.56455/000_all_initd-location.patch,
+files/1.0.5.56455/001_all_fix-permissions.patch,
+files/1.0.5.56455/002_all_pagebreak-detection-fix.patch,
+files/1.0.5.56455/004_all_do-not-build-modules.patch,
+files/1.0.5.56455/007_all_use-modprobe-over-insmod.patch,
+files/1.0.5.56455/009_all_init.d-modules-warning.patch,
+vmware-player-1.0.5.56455.ebuild:
Version bump for bug #193196.
28 Jul 2007; Mike Auty <ikelos@gentoo.org>
files/digest-vmware-player-1.0.2.29634,
files/digest-vmware-player-1.0.3.34682-r1,
files/digest-vmware-player-2.0.0.45731, Manifest:
Redigest for vmware-any-any-update112.
13 Jul 2007; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-player-1.0.2.29634.ebuild, vmware-player-1.0.3.34682-r1.ebuild,
vmware-player-2.0.0.45731.ebuild:
Added another mirror for the vmware-any-any-update patchset.
02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
vmware-player-1.0.2.29634.ebuild:
(QA) RESTRICT clean up.
*vmware-player-2.0.0.45731 (24 Jun 2007)
24 Jun 2007; Mike Auty <ikelos@gentoo.org>
+files/2.0.0.45731/000_all_initd-location.patch,
+files/2.0.0.45731/001_all_fix-permissions.patch,
+files/2.0.0.45731/002_all_pagebreak-detection-fix.patch,
+files/2.0.0.45731/004_all_do-not-build-modules.patch,
+files/2.0.0.45731/007_all_use-modprobe-over-insmod.patch,
+files/2.0.0.45731/009_all_init.d-modules-warning.patch,
+vmware-player-2.0.0.45731.ebuild:
Version bump, new version supports 64-bit natively and USB 2.0.
*vmware-player-1.0.3.34682-r1 (16 Jun 2007)
16 Jun 2007; Mike Auty <ikelos@gentoo.org>
-files/1.0.1.19317/000_all_initd-location.patch,
-files/1.0.1.19317/002_all_pagebreak-detection-fix.patch,
+files/1.0.3.34682/000_all_initd-location.patch,
-files/1.0.1.19317/001_all_fix-permissions.patch,
-files/1.0.1.19317/004_all_do-not-build-modules.patch,
-files/1.0.1.19317/007_all_use-modprobe-over-insmod.patch,
-files/1.0.1.19317/009_all_init.d-modules-warning.patch,
+files/1.0.3.34682/001_all_fix-permissions.patch,
+files/1.0.3.34682/002_all_pagebreak-detection-fix.patch,
+files/1.0.3.34682/004_all_do-not-build-modules.patch,
+files/1.0.3.34682/007_all_use-modprobe-over-insmod.patch,
+files/1.0.3.34682/009_all_init.d-modules-warning.patch,
-vmware-player-1.0.3.34682.ebuild, +vmware-player-1.0.3.34682-r1.ebuild:
Version bump to fix missing patchset, bug 175778.
28 Apr 2007; Mike Auty <ikelos@gentoo.org> files/vmware-player.rc:
Redigest for vmware-any-any109, and fix rc file for baselayout-2.
07 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org>
files/vmware-player.rc:
Change all instances of [ to [[.
04 Mar 2007; Mike Auty <ikelos@gentoo.org>
files/digest-vmware-player-1.0.2.29634,
files/digest-vmware-player-1.0.3.34682, Manifest:
Bump vmware-any-any to 108.
05 Feb 2007; Mike Auty <ikelos@gentoo.org>
files/digest-vmware-player-1.0.2.29634,
files/digest-vmware-player-1.0.3.34682, Manifest:
Vmware-any-any bump.
*vmware-player-1.0.3.34682 (14 Dec 2006)
14 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+vmware-player-1.0.3.34682.ebuild:
Version bump and closing bug #158101.
14 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-player-1.0.2.29634.ebuild:
Fixed typo for bug #158134.
01 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-vmware-player-1.0.1.19317-r4.ebuild,
-vmware-player-1.0.1.19317-r6.ebuild,
-vmware-player-1.0.1.19317-r7.ebuild, vmware-player-1.0.2.29634.ebuild:
Updated digest for vmware-any-any-update105, removed older ebuilds, and
marked 1.0.2 stable on amd64/x86.
24 Oct 2006; Simon Stelling <blubb@gentoo.org>
vmware-player-1.0.1.19317-r7.ebuild:
stable on amd64 wrt bug 148682
20 Oct 2006; Joshua Jackson <tsunam@gentoo.org>
vmware-player-1.0.1.19317-r7.ebuild:
Stable x86; bug #148682
*vmware-player-1.0.1.19317-r7 (03 Oct 2006)
03 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+vmware-player-1.0.1.19317-r7.ebuild, vmware-player-1.0.2.29634.ebuild:
New revision ebuilds to hopefully finally fix bug #148682.
*vmware-player-1.0.1.19317-r6 (02 Oct 2006)
02 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-vmware-player-1.0.1.19317-r5.ebuild,
+vmware-player-1.0.1.19317-r6.ebuild, vmware-player-1.0.2.29634.ebuild:
Alright, we are revision-bumping again so that we pull in my pre-compiled
libssl.so.0.9.7 for bug #148862.
*vmware-player-1.0.2.29634 (28 Sep 2006)
28 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+files/1.0.2.29634/000_all_initd-location.patch,
+files/1.0.2.29634/001_all_fix-permissions.patch,
+files/1.0.2.29634/002_all_pagebreak-detection-fix.patch,
+files/1.0.2.29634/004_all_do-not-build-modules.patch,
+files/1.0.2.29634/007_all_use-modprobe-over-insmod.patch,
+files/1.0.2.29634/009_all_init.d-modules-warning.patch,
+vmware-player-1.0.2.29634.ebuild:
Version bump to 1.0.2, which I am leaving masked for the time being because
I hate the idea of forcing more than 100MB on people that they don't need. I
will unmask this once I come up with a better solution.
*vmware-player-1.0.1.19317-r5 (27 Sep 2006)
27 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+vmware-player-1.0.1.19317-r5.ebuild:
Revision bump to force an upgrade due to bug #148682.
25 Aug 2006; Mike Auty <ikelos@gentoo.org>
files/digest-vmware-player-1.0.1.19317-r4, Manifest:
Redigested for vmware-any-any-update104.
22 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-files/vmware-player-1.0.1.19317-config.patch,
-files/vmware-player-1.0.1.19317-config2.patch,
-files/vmware-player-1.0.1.19317-config3.patch, -files/vmware.rc,
-files/vmware.xml, -vmware-player-1.0.1.19317-r3.ebuild,
vmware-player-1.0.1.19317-r4.ebuild:
Stable on amd64 and x86. Removing older revisions in preparation for 1.0.2
coming to the tree.
*vmware-player-1.0.1.19317-r4 (09 Aug 2006)
09 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+files/1.0.1.19317/000_all_initd-location.patch,
+files/1.0.1.19317/001_all_fix-permissions.patch,
+files/1.0.1.19317/002_all_pagebreak-detection-fix.patch,
+files/1.0.1.19317/004_all_do-not-build-modules.patch,
+files/1.0.1.19317/007_all_use-modprobe-over-insmod.patch,
+files/1.0.1.19317/009_all_init.d-modules-warning.patch,
+files/vmware-player.rc, +files/vmware-player.xml,
+vmware-player-1.0.1.19317-r4.ebuild:
Moved vmware.eclass enabled version into the tree.
08 Aug 2006; Mike Auty <ikelos@gentoo.org> ChangeLog:
New digests to work with vmware-any-any103, which fixes some problems with
the 2.6.18 kernel.
27 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-player-1.0.1.19317-r3.ebuild:
Changed to use mirror://vmware instead of the individual sites.
23 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-player-1.0.1.19317-r3.ebuild:
Marking stable on amd64 and x86.
27 Apr 2006; Marien Zwart <marienz@gentoo.org>
files/digest-vmware-player-1.0.1.19317-r3, Manifest:
Fixing SHA256 digest for real, pass three...
27 Apr 2006; Marien Zwart <marienz@gentoo.org>
files/digest-vmware-player-1.0.1.19317-r3, Manifest:
Fixing SHA256 digest, pass two.
*vmware-player-1.0.1.19317-r3 (17 Apr 2006)
17 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-vmware-player-1.0.1.19317-r2.ebuild,
+vmware-player-1.0.1.19317-r3.ebuild:
Revision bump to pull in update101.
30 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-vmware-player-1.0.1.19317.ebuild, -vmware-player-1.0.1.19317-r1.ebuild:
Removing older ebuilds as they are no longer needed.
*vmware-player-1.0.1.19317-r2 (30 Mar 2006)
30 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+files/vmware-player-1.0.1.19317-config3.patch,
+vmware-player-1.0.1.19317-r2.ebuild:
Added patch for vmware-config.pl to allow for 2G/2G from 2.6.16 and closing
bug #127661 and bug #127023.
*vmware-player-1.0.1.19317-r1 (20 Mar 2006)
20 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+vmware-player-1.0.1.19317-r1.ebuild:
Added a new revision with vmware-any-any-update98 that should also resolve
bug #117696.
22 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-player-1.0.1.19317.ebuild:
Changed vmplayer->vmware for the init script name and closing bug #119871.
06 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-player-1.0.1.19317.ebuild:
Added modular X dependencies and closing bug #117987.
04 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-files/vmware-player-1.0.0.18587-config.patch,
-vmware-player-1.0.0.18587.ebuild:
Cleaning up older ebuilds.
*vmware-player-1.0.1.19317 (04 Jan 2006)
04 Jan 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+files/vmware-player-1.0.1.19317-config.patch,
+files/vmware-player-1.0.1.19317-config2.patch,
+vmware-player-1.0.1.19317.ebuild:
Version bumped to 1.0.1.19317 and closing bug #116846.
21 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-player-1.0.0.18587.ebuild:
Added dependency on newer baselayout so people will quit filing bugs over
and over again for the same thing.
21 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-files/vmware-player-1.0.0.18007-config.patch,
+files/vmware-player-1.0.0.18587-config.patch:
Renamed patch and fixing bug #115465 (again).
*vmware-player-1.0.0.18587 (19 Dec 2005)
19 Dec 2005; Chris Gianelloni <wolf31o2@gentoo.org>
-vmware-player-1.0.0.18007.ebuild, +vmware-player-1.0.0.18587.ebuild:
Version bumped to 18587 and closing bug #115465.
*vmware-player-1.0.0.18007 (29 Nov 2005)
29 Nov 2005; Chris Gianelloni <wolf31o2@gentoo.org>
+files/90vmware-player, +files/vmware-player-1.0.0.18007-config.patch,
+files/vmware.rc, +files/vmware.xml, +metadata.xml,
+vmware-player-1.0.0.18007.ebuild:
Initial import. Original ebuild by Eric Edgar <rocket@gentoo.org> and
modified by Derick Swanepoel <derick@up.ac.za> and myself. Closing bug
#110027.

View File

@ -1,29 +0,0 @@
AUX 1.0.9.126128/000_all_initd-location.patch 1131 RMD160 3ab69d825994cc3bb177143d27091fc292cec46a SHA1 14264460c8500f1ead267059e2b9b9a5dc8c057f SHA256 b4055370b0092e71a2b2b0f27edeb7bc063ad265f95ab4530e52c3ab3167ad62
AUX 1.0.9.126128/001_all_fix-permissions.patch 647 RMD160 0f25f7dd60dfcb5a72b1f7b9cf344d6f431143a9 SHA1 cabd3dd071ef62d4c70f52d1a3e02334ec7f3a73 SHA256 41492cde60da6d449c0f427ac7bd65598838ec17ac0e3a5f545feeb1d29ea391
AUX 1.0.9.126128/002_all_pagebreak-detection-fix.patch 800 RMD160 f21a51e552d025a5120519d6dcd41efc3835a432 SHA1 06133c332b6b1f57476b1154de108a9dfc35435d SHA256 d327d7cb2166b9ef4c8c286568c3a7eb64542212164d58b8a7a3c5e51e19ed6d
AUX 1.0.9.126128/004_all_do-not-build-modules.patch 589 RMD160 b2153579c65a232de9c2e6dbd9bbe108d85f95e5 SHA1 394a67a30f1f29084836183303641915ce982bfd SHA256 916754b0616ea330490b9572be1a9216bb7dd441ba328b1e01e777b29fac4e1e
AUX 1.0.9.126128/007_all_use-modprobe-over-insmod.patch 445 RMD160 186ab443a733276a702dea16a23c04f7deed9d13 SHA1 c7113cd3f7f91527397f6fb07797d4e9c5c6f011 SHA256 bcf4930fae4812c8fbb2eb58b200f1da9441d97cd0c74b8ee6250cf097a28630
AUX 1.0.9.126128/009_all_init.d-modules-warning.patch 991 RMD160 6205e976db47cd3361b5eca8593414d411a2ab8d SHA1 3742749baa606a57d447931f0af791696a49e660 SHA256 5fbc9f101abb3816a732f64a75e90ce7fcb6783c3cd7bae521d8785e88634498
AUX 2.5.3.185404/vmware-player-extras.py.patch 426 RMD160 458d95094d2e47726221ab427486b263b87e4297 SHA1 e41c36cfe150380aceafd1768e9e159fb4e1813f SHA256 1047cdc79d4bc138deaf809f191bdde69c4a5a8ed6ab5b595457a341ecb68abb
AUX 2.5.3.185404/vmware-player.py.patch 2936 RMD160 6b9957799b3571f5382975c4d78bc3db7d16e666 SHA1 b32f9e4c2d2213872a7d8f88754a8552b113567f SHA256 fa711634a038d313769cf5d5180ca96bfb3ba18f392f6c0dd0672a4b4f7d6c9c
AUX 3.0.0.203739/vmware-player-app.py.patch 3231 RMD160 990c456efaff87bdd76719e40eb2a87e3efbc037 SHA1 efc324891f4fa5d04ad586897909158495e67f9e SHA256 d204041310495209fc77b6ed54ea25839b19f52d59176cc33cffdf86a7243431
AUX 90vmware-player 91 RMD160 025ff93348f5a838183e4f6108d7030168ca5ed5 SHA1 54c316adaafce41771eb26513c960dabbed61ce9 SHA256 9aee16313163bd9e161e81ef2876d086fb8972489100c4f8f0a4695ff16578f9
AUX helpers/module_patcher.sh 174 RMD160 0b2d1ee14443ec188546b090ae2c5e6efd132026 SHA1 f00ea5d03430be4969834bda822ed2865ef6e079 SHA256 1e63240f7e21e119c8e0b083f540fdde83fc22d781f3abe43927713a464898ea
AUX helpers/unbundler.sh 1828 RMD160 d5bb43628d105c4372fa1fe7e7ebac29300fa91f SHA1 ed4b2645369b63e1cb6e322d412eb2ede1cbbdcd SHA256 4e71dd96f5136c1eb98be5e1184b9ec48ed9ac7935fa1defd94d501cef05eb78
AUX helpers/vmware-config.sh 497 RMD160 04addab6d99bf2c984f855a97b935ca8e0e584d8 SHA1 935eb3f565cebdca806d20e852a4bc75c7bc420b SHA256 72712959b26b22bfe8118561cd7b0751973d2a9dd8c2b15379cd42dc8a4ac246
AUX vmware-player-2.5.3.185404-installer.patch 2919 RMD160 7921285177ee1238501a95bbab78d100a307674d SHA1 df430803a06ef073a9725b2c86e210c3cc62ceed SHA256 ef63e8d642ae77bf10f22a586c4c37e5c387f76084d71350a9af418d1c5a2858
AUX vmware-player-2.5.rc 1434 RMD160 7bcf047a381e553cab882db6ab42b28903f972f9 SHA1 c668713f6d1fc61c226207b7176f106ac692454e SHA256 ef245385f56b2863580c0c6c00e470118ddc4cf364c818092568891ebba75429
AUX vmware-player-3.0.0.203739-installer.patch 2967 RMD160 be8dbd5ef86df784c1e8d7c3cd8267cd48b3c849 SHA1 6d400351f435cc31f0ff1dd019868813ea388337 SHA256 3f4cfaa9785a8acfbf8bd7db3401d08360c65e0e08e5a49d55138eab40de1bf6
AUX vmware-player.rc 1852 RMD160 e3cc563af38ef690b16bfbdcc0080156af2eab37 SHA1 5436cfd0e75ab842b86826b0abc298a2b9433963 SHA256 ef77428df2608613860cd79683648a45d99657150e7c901d7f449b8df4528fee
AUX vmware-player.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d
DIST VMware-Player-2.5.3-185404.i386.bundle 101075736 RMD160 f6308e916e061b983a5a0864ab0a69288260aa19 SHA1 2f6497890b17b37480165bab9f430e8645edae9b SHA256 a04260cefcb4dda216e85f50948ee6995241f331a462f4391089524d159093bb
DIST VMware-Player-2.5.3-185404.x86_64.bundle 64357415 RMD160 d5d9e4a9466a5672f476cdb2d75aae1431d4a618 SHA1 acd69fcb0c6bc49fd4af748c65c7fb730ab1e8c4 SHA256 0db6fb6581417adda98de6ab2e7711acba0507acad3b5bb675d6287c36e96b16
DIST VMware-Player-3.0.0-203739.i386.bundle 84248074 RMD160 795d2dbaa020b3965e2b606f612dff10d7229f0e SHA1 d227c7f68dd6a65ee50c2cffdfeb78b82d3f2858 SHA256 d45f5823c8a8ed990123a74bdb3ebfa84ef34c2074746c7c2874e86e75aa9aaf
DIST VMware-Player-3.0.0-203739.x86_64.bundle 79403031 RMD160 79f4aca72e3cbb742bcd692d1a91105a938948a8 SHA1 e06d53fb30e02abe499526dd4528f18997d5c542 SHA256 0686d6434ad7d49a866a5abbd978a56a937d8f9125366d08d2dfa418dee3b40a
DIST VMware-player-1.0.9-126128.tar.gz 38963760 RMD160 ed54df1e097894f11b7bbce8215d1f314df03217 SHA1 701ca338ec52dcb60db26908de8e0b5bfd981fb7 SHA256 3fae981892437ec1804a2171b701ca33000405fbd799fb06112fd70c939d8d75
DIST vmware-any-any-update115.tar.gz 493641 RMD160 56cabe56f70c01a22a7671e861cc5a2df19855c7 SHA1 ff9b6fdf6ca74495eb5f4822a1854fc91185377c SHA256 b1c14fa9514663b85c2efe8331407e71cce96e5a21a8b941fa570c960bbdcaa1
EBUILD vmware-player-1.0.9.126128.ebuild 2644 RMD160 51390672c478b261a3ad976c8d481a6bc58befa9 SHA1 3a7a016cc618c1fc3aec8fc1dcf0cf5bbb8f5570 SHA256 bcdc677fd9c4a2ad29e476c1367bb70480d8b219ddd42e7d571c56a5512ecbbc
EBUILD vmware-player-2.5.3.185404.ebuild 4956 RMD160 aecbe1a228cc3fe36d68c5aac70f5422491680f0 SHA1 8135e4a8eb2c25b9b8c37a18e4dd442faa639212 SHA256 78bfb2da235bbd6a95911a5260e8aa7d70a552b6ac44b041bf32efb6cddf9e7e
EBUILD vmware-player-3.0.0.203739.ebuild 5167 RMD160 dde4387062be70641da259b4df638e2747d037b1 SHA1 9f66c6536c5244608a9a6f715bca2e7e5281f9e0 SHA256 669e8ca06de6f6ad82809f0061e592fb62225ed68baaf7c68bff8fafea8a01d9
MISC ChangeLog 25472 RMD160 6d6284334c5b528f7832bc1ea65d8c3f6838f68b SHA1 dfdf0a8ac46e48d6a9a89b6e3647a53a2d73f9b8 SHA256 05250893ce0aaec90eb37297f7232e332245d66f50c45073e4f38467105ccbdb
MISC metadata.xml 567 RMD160 c0ff8ce9582a8a5a47328014a8d2f0856e40ab34 SHA1 2f687280a7f0fa6c3a83da165e84e2e553b6cce2 SHA256 4cfc81f281a4cdd8d9f75ad60006eed098dabb66bb035f9920ac344d4780151f

View File

@ -1,31 +0,0 @@
--- vmware-distrib/bin/vmware-config.pl.ori 2005-11-09 01:45:08.000000000 +0000
+++ vmware-distrib/bin/vmware-config.pl 2005-11-09 01:48:21.000000000 +0000
@@ -8433,7 +8433,7 @@
error('Please shut down any running VMs and run this script again.' .
"\n\n");
} else {
- if (system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware')
+ if (system(shell_string('/etc/init.d' . '/vmware')
. ' stop')) {
error('Unable to stop services for ' . vmware_product_name() .
"\n\n");
@@ -8463,8 +8463,8 @@
}
if (vmware_product() ne 'server') {
configure_gtk2();
- createMimePackageFile();
- configureDesktopFiles();
+# createMimePackageFile();
+# configureDesktopFiles();
configure_mon();
configure_pp();
configure_net();
@@ -8532,7 +8532,7 @@
db_save();
# Then start VMware's services
if (!$gOption{'skipstopstart'}) {
- system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware') . ' start');
+ system(shell_string('/etc/init.d' . '/vmware') . ' start');
print "\n";
}

View File

@ -1,15 +0,0 @@
diff -urN vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl
--- vmware-distrib.orig/bin/vmware-config.pl 2005-12-16 00:51:03.000000000 -0500
+++ vmware-distrib/bin/vmware-config.pl 2005-12-21 14:34:03.000000000 -0500
@@ -7327,7 +7327,10 @@
error('Unable to write configuration file "' . $name . '".' . "\n\n");
}
db_add_file($name, 0x1);
- safe_chmod(0644, $name);
+ safe_chmod(0664, $name);
+ my $gid = (getgrnam('vmware'))[2];
+ my $uid = (stat($name))[4];
+ safe_chown($uid,$gid,$name);
# Append the promotional configuration if it exists
$promoconfig = $libdir . '/configurator/PROMOCONFIG';

View File

@ -1,15 +0,0 @@
diff -ur vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl
--- vmware-distrib.orig/bin/vmware-config.pl 2006-03-24 23:13:05.000000000 +0100
+++ vmware-distrib/bin/vmware-config.pl 2006-03-24 23:26:40.000000000 +0100
@@ -2015,9 +2015,9 @@
. shell_string($pattern));
chomp($header_page_offset);
# Ignore PAGE_OFFSET if we cannot parse it.
- if ($header_page_offset =~ /^$pattern \(?0x([0-9a-fA-F]{8,})/) {
+ if ($header_page_offset =~ /^$pattern \(?(\([^)]*\))?\)?0x([0-9a-fA-F]{8,}).*$/) {
# We found a valid page offset
- $header_page_offset = $1;
+ $header_page_offset = $2;
if (defined($gSystem{'page_offset'}) and
not (lc($header_page_offset) eq lc($gSystem{'page_offset'}))) {
if ($source eq 'user') {

View File

@ -1,17 +0,0 @@
diff -uNr vmware-server-distrib.orig/bin/vmware-config.pl vmware-server-distrib/bin/vmware-config.pl
--- vmware-server-distrib.orig/bin/vmware-config.pl 2006-02-18 18:12:26.000000000 +0000
+++ vmware-server-distrib/bin/vmware-config.pl 2006-02-18 18:14:17.000000000 +0000
@@ -8571,10 +8571,10 @@
configure_gtk2();
# createMimePackageFile();
# configureDesktopFiles();
- configure_mon();
- configure_pp();
+# configure_mon();
+# configure_pp();
configure_net();
- build_vmnet();
+# build_vmnet();
}
# Create the directory for the UNIX domain sockets

View File

@ -1,12 +0,0 @@
diff -uNr vmware-server-distrib/installer/services.sh vmware-server-distrib.new/installer/services.sh
--- vmware-server-distrib/installer/services.sh 2006-02-05 00:21:25.000000000 +0000
+++ vmware-server-distrib.new/installer/services.sh 2006-02-20 23:48:07.000000000 +0000
@@ -538,7 +538,7 @@
}
vmware_load_module() {
- /sbin/insmod -s -f "/lib/modules/`uname -r`/misc/$1.o" || exit 1
+ /sbin/modprobe -s "$1" || exit 1
exit 0
}

View File

@ -1,19 +0,0 @@
diff -uNr vmware-server-distrib.orig/installer/services.sh vmware-server-distrib/installer/services.sh
--- vmware-server-distrib.orig/installer/services.sh 2006-07-01 03:14:16.000000000 +0000
+++ vmware-server-distrib/installer/services.sh 2006-07-14 11:59:28.000000000 +0000
@@ -606,8 +606,13 @@
start)
if [ -e "$vmware_etc_dir"/not_configured ]; then
echo "`vmware_product_name`"' is installed, but it has not been (correctly) configured'
- echo 'for the running kernel. To (re-)configure it, invoke the'
- echo 'following command: '"$vmdb_answer_BINDIR"'/vmware-config.pl.'
+ echo 'for the running kernel.'
+ echo
+ echo 'Please ensure that the modules have been compiled for this kernel:'
+ echo ' emerge --oneshot vmware-modules'
+ echo
+ echo 'Also ensure '"`vmware_product_name`"' has been configured:'
+ echo ' '"$vmdb_answer_BINDIR"'/vmware-config.pl'
echo
exit 1

View File

@ -1,14 +0,0 @@
diff --git a/vmware-player-extras.py b/vmware-player-extras.py
index 21595b1..e8adf08 100644
--- a/vmware-player-extras.py
+++ b/vmware-player-extras.py
@@ -6,7 +6,8 @@ VMware Player Extras component installer.
DEST = LIBDIR/'vmware'
SETTINGS = { 'vmware.fullpath': BINDIR/'vmware', }
-CONF = DEST/'setup/vmware-config'
+import os
+CONF = path(os.environ['WORKDIR'])/'vmware-config.sh'
class PlayerExtras(Installer):

View File

@ -1,64 +0,0 @@
diff --git a/vmware-player.py b/vmware-player.py
index bee22df..d06cca9 100644
--- a/vmware-player.py
+++ b/vmware-player.py
@@ -6,7 +6,8 @@ VMware Player component installer.
GCONF_DEFAULTS = 'xml:readwrite:/etc/gconf/gconf.xml.defaults'
DEST = LIBDIR/'vmware'
-CONFIG = DEST/'setup/vmware-config'
+import os
+CONFIG = path(os.environ['WORKDIR'])/'vmware-config.sh'
CUPSLIBDIR = LIBDIR/'cups'
# XXX: LIBDIR should be properly calculated, to make this cleaner
if (PREFIX/'lib64/cups').exists():
@@ -84,12 +85,12 @@ class Player(Installer):
ret, kvers = output('uname', '-r')
kvers = kvers.strip()
modules = ('vmmon', 'vmnet', 'vmblock', 'vmci', 'vsock')
- base = path('/lib/modules/%s/misc' % kvers)
+ base = path('/this/path/doesnt/exist/lib/modules/%s/misc' % kvers)
for module in modules:
for ext in ('o', 'ko'):
mod = '%s.%s' % (module, ext)
- (base/mod).remove(ignore_errors=True)
+ # (base/mod).remove(ignore_errors=True)
def PreUninstall(self, old, new, upgrade):
script = INITSCRIPTDIR/'vmware'
@@ -156,8 +157,8 @@ class Player(Installer):
def PostTransactionInstall(self, old, new, upgrade):
if ENV.get('VMWARE_SKIP_MODULES'):
log.info('Skipping kernel module installation')
- elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
- log.info('Successfully installed kernel modules')
+ # elif run(BINDIR/'vmware-modconfig', '--console', '--install-all') == 0:
+ # log.info('Successfully installed kernel modules')
else:
log.info('Unable to install kernel modules')
@@ -189,8 +190,8 @@ class Player(Installer):
for handler in ('vm', 'vms'):
for gconfType, key, value in settings:
key = key % handler
- run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
- '--type', gconfType, '--set', key, value)
+ # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
+ # '--type', gconfType, '--set', key, value)
# Instruct all gconfd daemons to reload.
run('killall', '-HUP', 'gconfd-2')
@@ -200,9 +201,9 @@ class Player(Installer):
def _deconfigureVMStreamingHandlers(self):
""" Deconfigures the handlers for vm:// and vms:// used for VM streaming"""
def deconfigureGConf():
- for handler in ('vm', 'vms'):
- run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
- '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
+ # for handler in ('vm', 'vms'):
+ # run('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
+ # '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
# Instruct all gconfd daemons to reload.
run('killall', '-HUP', 'gconfd-2')

View File

@ -1,70 +0,0 @@
Submitted By: Mario Fetka (geos_one) (mario dot fetka at gmail dot com)
Date: 2009-12-25
Initial Package Version: 2.5.3
Origin: gentoo
Upstream Status: never accepted
Description: patch in the modified install sources
diff -Naur 3.0.0.orig/vmware-player-app.py 3.0.0/vmware-player-app.py
--- 3.0.0.orig/vmware-player-app.py 2009-12-25 10:31:40.605560643 +0000
+++ 3.0.0/vmware-player-app.py 2009-12-25 10:39:48.550559786 +0000
@@ -6,7 +6,8 @@
GCONF_DEFAULTS = 'xml:readwrite:/etc/gconf/gconf.xml.defaults'
DEST = LIBDIR/'vmware'
-CONFIG = DEST/'setup/vmware-config'
+import os
+CONFIG = path(os.environ['WORKDIR'])/'vmware-config.sh'
CUPSLIBDIR = LIBDIR/'cups'
SETTINGS = \
{ 'libdir': DEST,
@@ -166,12 +167,12 @@
ret, kvers, _ = self.RunCommand('uname', '-r')
kvers = kvers.strip()
modules = ('vmmon', 'vmnet', 'vmblock', 'vmci', 'vsock')
- base = path('/lib/modules/%s/misc' % kvers)
+ base = path('/this/path/doesnt/exist/lib/modules/%s/misc' % kvers)
for module in modules:
for ext in ('o', 'ko'):
mod = '%s.%s' % (module, ext)
- (base/mod).remove(ignore_errors=True)
+ # (base/mod).remove(ignore_errors=True)
# Make sure we kill all processes that should not be running!
self._killVMwareProcesses()
@@ -329,8 +330,8 @@
def PostTransactionInstall(self, old, new, upgrade):
if ENV.get('VMWARE_SKIP_MODULES'):
log.Info('Skipping kernel module installation')
- elif self.RunCommand(BINDIR/'vmware-modconfig', '--console', '--install-all').retCode == 0:
- log.Info('Successfully installed kernel modules')
+ # elif self.RunCommand(BINDIR/'vmware-modconfig', '--console', '--install-all').retCode == 0:
+ # log.Info('Successfully installed kernel modules')
else:
log.Info('Unable to install kernel modules')
@@ -359,8 +360,8 @@
for handler in ('vm', 'vms'):
for gconfType, key, value in settings:
key = key % handler
- self.RunCommand('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
- '--type', gconfType, '--set', key, value)
+ # self.RunCommand('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
+ # '--type', gconfType, '--set', key, value)
# Instruct all gconfd daemons to reload.
self.RunCommand('killall', '-HUP', 'gconfd-2')
@@ -370,9 +371,9 @@
def _deconfigureVMStreamingHandlers(self):
""" Deconfigures the handlers for vm:// and vms:// used for VM streaming"""
def deconfigureGConf():
- for handler in ('vm', 'vms'):
- self.RunCommand('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
- '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
+ # for handler in ('vm', 'vms'):
+ # self.RunCommand('gconftool-2', '--direct', '--config-source', GCONF_DEFAULTS,
+ # '--recursive-unset', '/desktop/gnome/url-handlers/%s' % handler)
# Instruct all gconfd daemons to reload.
self.RunCommand('killall', '-HUP', 'gconfd-2')

View File

@ -1,3 +0,0 @@
PATH=/opt/vmware/player/bin
ROOTPATH=/opt/vmware/player/bin
MANPATH=/opt/vmware/player/man

View File

@ -1,8 +0,0 @@
#!/bin/bash
MY_BASE=$(basename $1)
if [ -f ${FILESDIR}/${PV}/${MY_BASE}.patch ];
then
echo -n "Module Patcher: "
patch -f -p1 ${1} < ${FILESDIR}/${PV}/${MY_BASE}.patch
fi

View File

@ -1,91 +0,0 @@
#!/bin/bash
ORIGFILE="$1"
is_relative() {
local path="$1"
shift
[ "${path:0:1}" != "/" ]
return
}
set_offsets() {
# This won't work with non-GNU stat.
FILE_SIZE=`stat -L --format "%s" "$1"`
local offset=$(($FILE_SIZE - 4))
MAGIC_OFFSET=$offset
offset=$(($offset - 4))
CHECKSUM_OFFSET=$offset
offset=$(($offset - 4))
VERSION_OFFSET=$offset
offset=$(($offset - 4))
PREPAYLOAD_OFFSET=$offset
offset=$(($offset - 4))
PREPAYLOAD_SIZE_OFFSET=$offset
offset=$(($offset - 4))
LAUNCHER_SIZE_OFFSET=$offset
offset=$(($offset - 4))
PAYLOAD_OFFSET=$offset
offset=$(($offset - 4))
PAYLOAD_SIZE_OFFSET=$offset
offset=$(($offset - 4))
}
set_lengths() {
local file="$1"
if [ ! -s "$file" ]; then
echo "$file does not exist"
exit 1
fi
# XXX: put extraction in its own function
MAGIC_NUMBER=`od -An -t u4 -N 4 -j $MAGIC_OFFSET "$file" | tr -d ' '`
if [ "$MAGIC_NUMBER" != "907380241" ]; then
echo "magic number does not match"
exit 1
fi
LAUNCHER_SIZE=`od -An -t u4 -N 4 -j $LAUNCHER_SIZE_OFFSET "$file" | tr -d ' '`
PAYLOAD_SIZE=`od -An -t u4 -N 4 -j $PAYLOAD_SIZE_OFFSET "$file" | tr -d ' '`
PREPAYLOAD_SIZE=`od -An -t u4 -N 4 -j $PREPAYLOAD_SIZE_OFFSET "$file" | tr -d ' '`
SKIP_BYTES=$(($PREPAYLOAD_SIZE + $LAUNCHER_SIZE))
return 0
}
if is_relative "${ORIGFILE}"; then
ORIGFILE="`pwd`/${ORIGFILE}"
fi
set_offsets ${ORIGFILE}
set_lengths ${ORIGFILE}
echo "Unbundling" ${ORIGFILE}
PREPAYLOAD="prepayload"
PAYLOAD="payload"
# Unpack the pre-payload file
mkdir ${PREPAYLOAD}
cd ${PREPAYLOAD}
dd if="${ORIGFILE}" ibs=$LAUNCHER_SIZE obs=1024 skip=1 | tar -xzf - 2> /dev/null
cd ..
# Unpack the main file
mkdir ${PAYLOAD}
cd ${PAYLOAD}
dd if="${ORIGFILE}" ibs=$SKIP_BYTES obs=1024 skip=1 | tar -xzf - 2> /dev/null
cd ..

View File

@ -1,29 +0,0 @@
#!/bin/bash
CONFIG_FILE="${D}/etc/vmware/config"
remove_key() {
local key=${1}
grep -v "^${key} =" ${CONFIG_FILE}
grep -v "^${key} =" ${CONFIG_FILE} > ${CONFIG_FILE}.tmp
mv ${CONFIG_FILE}.tmp ${CONFIG_FILE}
}
add_key() {
local key=${1}
local value=${2}
echo "${1} = \"${2}\"" >> ${CONFIG_FILE}
}
mkdir -p $(dirname ${CONFIG_FILE})
touch ${CONFIG_FILE}
if [ "${1}" == "-s" ]; then
remove_key ${2}
add_key ${2} ${3/${D}/}
fi
if [ "${1}" == "-d" ]; then
remove_key ${2}
fi

View File

@ -1,64 +0,0 @@
diff --git a/payload/install/vmware-installer/vmis/__init__.py b/payload/install/vmware-installer/vmis/__init__.py
index 7a46312..e1dbff1 100644
--- a/payload/install/vmware-installer/vmis/__init__.py
+++ b/payload/install/vmware-installer/vmis/__init__.py
@@ -12,5 +12,5 @@ VERSION_INFO = (1,0)
VERSION = '.'.join([str(x) for x in VERSION_INFO])
MAJOR_VERSION = VERSION_INFO[0]
-CONFDIR = path(u'/etc/vmware')
+CONFDIR = path(u'./vmware-confdir')
DATABASE_PATH = CONFDIR/'database'
diff --git a/payload/install/vmware-installer/vmis/core/env.py b/payload/install/vmware-installer/vmis/core/env.py
index e7abc2e..81c4a2b 100644
--- a/payload/install/vmware-installer/vmis/core/env.py
+++ b/payload/install/vmware-installer/vmis/core/env.py
@@ -66,6 +66,8 @@ def LoadInstaller(component, loadPath):
# Python will interrept as being a module separator
moduleName = component.name.replace('.', '')
fileObj, pathName, description = imp.find_module(moduleName, [loadPath])
+ print output(os.path.join(env['ENV'].get('WORKDIR', './'), 'module_patcher.sh'), pathName)[1],
+ fileObj = file(pathName)
try:
# XXX: db.config cannot be set at the module level because this
diff --git a/payload/install/vmware-installer/vmis/core/questions.py b/payload/install/vmware-installer/vmis/core/questions.py
index 2be10de..f92ecff 100644
--- a/payload/install/vmware-installer/vmis/core/questions.py
+++ b/payload/install/vmware-installer/vmis/core/questions.py
@@ -139,6 +139,9 @@ class InitDir(Directory):
"""
super(InitDir, self).Validate(answer)
+ ### GENTOO PATCH ### Finish early
+ return True
+
rcdirs = ('rc0.d', 'rc1.d', 'rc2.d', 'rc3.d', 'rc4.d', 'rc5.d', 'rc6.d')
answer = path(answer)
diff --git a/payload/install/vmware-installer/vmis/ui/console.py b/payload/install/vmware-installer/vmis/ui/console.py
index 525df75..abb81b3 100644
--- a/payload/install/vmware-installer/vmis/ui/console.py
+++ b/payload/install/vmware-installer/vmis/ui/console.py
@@ -148,7 +148,7 @@ class Wizard(object):
wrapper = TextWrapper()
wrapper.width = 79
wrapper.replace_whitespace = False # Needed to preserve paragraph spacing.
- Popen('more', stdin=PIPE).communicate(input=wrapper.fill(text))
+ Popen('less', stdin=PIPE).communicate(input=wrapper.fill(text))
except IOError: # RHEL4 appears to close stdin while we still expect it to be open
pass
diff --git a/payload/install/vmware-installer/vmis/util/log.py b/payload/install/vmware-installer/vmis/util/log.py
index 4f609c4..b07b89d 100644
--- a/payload/install/vmware-installer/vmis/util/log.py
+++ b/payload/install/vmware-installer/vmis/util/log.py
@@ -22,6 +22,8 @@ else:
# running a build)
LOG_FILE = '/tmp/vmware-installer.log'
+LOG_FILE = './vmware-installer.log'
+
if level <= logging.DEBUG:
MAX_BYTES = 0
BACKUP_COUNT = 0

View File

@ -1,74 +0,0 @@
#!/sbin/runscript
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/files/vmware-player-2.5.rc,v 1.1 2008/11/09 20:23:55 ikelos Exp $
depend() {
need localmount
use logger net hald
after samba
}
vmware_prettify() {
# Yea, the code is ugly but the output is pretty
state=$1
waserror=0
msgtype=0
while read line
do
[ "${line}" = "" ] && continue
if [ ${msgtype} -le 0 ]
then
if [ ${msgtype} -eq -1 ]
then
ewarn ${line}
continue
fi
case ${line} in
*:*)
einfon ${line}
echo
eend 0
msgtype=1;;
*)
ewarn ${line}
msgtype=-1
waserror=1;;
esac
continue
fi
# Strip out anything after the <esc> code
message=`echo ${line} | sed -e "s/^\(.*\).*$/\1/"`
einfon " ${message}"
echo
echo ${line} | grep -q done
status=$?
eend ${status}
if [ ${status} -eq 0 ]
then
logger -p local0.err -t vmware-${state} "${line}"
waserror=${status}
fi
done
if [ "${msgtype}" = "-1" ]
then
eend 1 "VMware is not properly configured! See above."
fi
return ${waserror}
}
start() {
test -x /etc/vmware/init.d/vmware || \
eend 1 "vmware init script not found. Aborting" || return 1
/etc/vmware/init.d/vmware start | vmware_prettify start
return $?
}
stop() {
/etc/vmware/init.d/vmware stop | vmware_prettify stop
return $?
}

View File

@ -1,61 +0,0 @@
diff -uNr a/payload/install/vmware-installer/vmis/core/env.py b/payload/install/vmware-installer/vmis/core/env.py
--- a/payload/install/vmware-installer/vmis/core/env.py 2009-12-24 20:55:30.507661355 +0100
+++ b/payload/install/vmware-installer/vmis/core/env.py 2009-12-24 20:58:15.135415801 +0100
@@ -305,6 +305,8 @@
# Python will interpret as being a module separator
moduleName = component.name.replace('.', '')
fileObj, pathName, description = imp.find_module(moduleName, [loadPath])
+ print output(os.path.join(env['ENV'].get('WORKDIR', './'), 'module_patcher.sh'), pathName)[1],
+ fileObj = file(pathName)
componentCoreVersion = component.coreVersion
if component.name == 'vmware-installer': # XXX: HARDCODE - Fix this.
diff -uNr a/payload/install/vmware-installer/vmis/core/questions.py b/payload/install/vmware-installer/vmis/core/questions.py
--- a/payload/install/vmware-installer/vmis/core/questions.py 2009-12-24 20:55:30.507661355 +0100
+++ b/payload/install/vmware-installer/vmis/core/questions.py 2009-12-24 20:58:15.135415801 +0100
@@ -199,6 +199,9 @@
"""
super(InitDir, self).Validate(answer)
+ ### GENTOO PATCH ### Finish early
+ return True
+
rcdirs = ('rc0.d', 'rc1.d', 'rc2.d', 'rc3.d', 'rc4.d', 'rc5.d', 'rc6.d')
answer = path(answer)
diff -uNr a/payload/install/vmware-installer/vmis/__init__.py b/payload/install/vmware-installer/vmis/__init__.py
--- a/payload/install/vmware-installer/vmis/__init__.py 2009-12-24 20:55:30.506662004 +0100
+++ b/payload/install/vmware-installer/vmis/__init__.py 2009-12-24 20:59:50.810416210 +0100
@@ -20,7 +20,7 @@
MAJOR_VERSION = VERSION_INFO[0]
VMISPYVERSION = os.environ.get('VMISPYVERSION')
-CONFDIR = path(u'/etc/vmware-installer')
+CONFDIR = path(u'./vmware-confdir')
DATABASE_PATH = CONFDIR/'database'
# Database setting for use by the installer and its component.
diff -uNr a/payload/install/vmware-installer/vmis/ui/console.py b/payload/install/vmware-installer/vmis/ui/console.py
--- a/payload/install/vmware-installer/vmis/ui/console.py 2009-12-24 20:55:30.509662503 +0100
+++ b/payload/install/vmware-installer/vmis/ui/console.py 2009-12-24 21:01:53.076664336 +0100
@@ -202,7 +202,7 @@
# If no pager is found, or cannot be found in
# the path, default to 'more'.
if not pager:
- pager = 'more'
+ pager = 'less'
# Append -E to less so it quits after the last line of
# the EULA is displayed.
diff -uNr a/payload/install/vmware-installer/vmis/util/log.py b/payload/install/vmware-installer/vmis/util/log.py
--- a/payload/install/vmware-installer/vmis/util/log.py 2009-12-24 20:55:30.509662503 +0100
+++ b/payload/install/vmware-installer/vmis/util/log.py 2009-12-24 20:58:15.136416130 +0100
@@ -31,6 +31,8 @@
# It's okay if it already exists
pass
+LOG_FILE = './vmware-installer.log'
+
if level <= logging.DEBUG:
MAX_BYTES = 0
BACKUP_COUNT = 0

View File

@ -1,86 +0,0 @@
#!/sbin/runscript
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/files/vmware-player.rc,v 1.5 2008/04/26 17:36:10 ikelos Exp $
depend() {
need localmount
use logger net hald
after samba
}
vmware_prettify() {
# Yea, the code is ugly but the output is pretty
state=$1
waserror=0
msgtype=0
while read line
do
[ "${line}" = "" ] && continue
if [ ${msgtype} -le 0 ]
then
if [ ${msgtype} -eq -1 ]
then
ewarn ${line}
continue
fi
case ${line} in
*:*)
einfon ${line}
echo
eend 0
msgtype=1;;
*)
ewarn ${line}
msgtype=-1
waserror=1;;
esac
continue
fi
# Strip out anything after the <esc> code
message=`echo ${line} | sed -e "s/^\(.*\).*$/\1/"`
einfon " ${message}"
echo
echo ${line} | grep -q done
status=$?
eend ${status}
if [ ${status} -eq 0 ]
then
logger -p local0.err -t vmware-${state} "${line}"
waserror=${status}
fi
done
if [ "${msgtype}" = "-1" ]
then
eend 1 "VMware is not properly configured! See above."
fi
return ${waserror}
}
start() {
test -x /etc/vmware/init.d/vmware || \
eend 1 "vmware init script not found. Aborting" || return 1
if modinfo vmblock > /dev/null 2>&1;
then
ebegin "Loading vmblock for drag and drop support"
local result
modprobe vmblock || eend 1 "Failed to load vmblock driver"
test ! -e /tmp/VMwareDnD && mkdir /tmp/VMwareDnD
chmod 1777 /tmp/VMwareDnD
mount -t vmblock none /proc/fs/vmblock/mountPoint || eend 1 "Failed to mount the vmblock filesystem"
eend 0
fi
/etc/vmware/init.d/vmware start | vmware_prettify start
return $?
}
stop() {
umount /proc/fs/vmblock/mountPoint > /dev/null 2>&1
/etc/vmware/init.d/vmware stop | vmware_prettify stop
return $?
}

View File

@ -1,48 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
<mime-type type="application/x-vmware-vm">
<comment xml:lang="en">VMware virtual machine</comment>
<magic priority="50">
<match type="string" value='config.version = "' offset="0:4096"/>
</magic>
<glob pattern="*.vmx"/>
</mime-type>
<mime-type type="application/x-vmware-vmdisk">
<comment xml:lang="en">VMware virtual disk</comment>
<magic priority="50">
<match type="string" value="# Disk DescriptorFile" offset="0"/>
<match type="string" value="KDMV" offset="0"/>
</magic>
<glob pattern="*.vmdk"/>
</mime-type>
<mime-type type="application/x-vmware-team">
<comment xml:lang="en">VMware team</comment>
<magic priority="50">
<match type="string" value='&lt;Foundry version="1"&gt;' offset="0">
<match type="string" value="&lt;VMTeam&gt;" offset="23:24"/>
</match>
</magic>
<glob pattern="*.vmtm"/>
</mime-type>
<mime-type type="application/x-vmware-snapshot">
<comment xml:lang="en">VMware virtual machine snapshot</comment>
<magic priority="50">
<match type="string" value="\\0xD0\\0xBE\\0xD0\\0xBE" offset="0"/>
</magic>
<glob pattern="*.vmsn"/>
</mime-type>
<mime-type type="application/x-vmware-vmfoundry">
<comment xml:lang="en">VMware virtual machine foundry</comment>
<magic priority="50">
<match type="string" value='&lt;Foundry version="1"&gt;' offset="0">
<match type="string" value="&lt;VM&gt;" offset="23:24"/>
</match>
</magic>
<glob pattern="*.vmxf"/>
</mime-type>
</mime-info>

View File

@ -1,14 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>vmware</herd>
<maintainer>
<email>vadimk@gentoo.org</email>
</maintainer>
<longdescription lang="en">
VMware Player - free desktop virtualization software application - makes it
easy to operate any virtual machine created by VMware Workstation, VMware Fusion,
VMware Server or VMware ESX, as well as Microsoft Virtual Server virtual
machines or Microsoft Virtual PC virtual machines.
</longdescription>
</pkgmetadata>

View File

@ -1,81 +0,0 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-1.0.9.126128.ebuild,v 1.3 2009/01/12 21:45:03 maekke Exp $
inherit eutils vmware versionator
S=${WORKDIR}/vmware-player-distrib
MY_P="VMware-player-$(get_version_component_range 1-3)-$(get_version_component_range 4)"
DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
HOMEPAGE="http://www.vmware.com/products/player/"
SRC_URI="mirror://vmware/software/vmplayer/${MY_P}.tar.gz
http://platan.vc.cvut.cz/ftp/pub/vmware/${ANY_ANY}.tar.gz
http://platan.vc.cvut.cz/ftp/pub/vmware/obsolete/${ANY_ANY}.tar.gz
http://ftp.cvut.cz/vmware/${ANY_ANY}.tar.gz
http://ftp.cvut.cz/vmware/obsolete/${ANY_ANY}.tar.gz
http://knihovny.cvut.cz/ftp/pub/vmware/${ANY_ANY}.tar.gz
http://knihovny.cvut.cz/ftp/pub/vmware/obsolete/${ANY_ANY}.tar.gz"
LICENSE="vmware"
IUSE=""
SLOT="0"
KEYWORDS="-* amd64 x86"
RESTRICT="strip"
DEPEND="${RDEPEND} virtual/os-headers
!app-emulation/vmware-workstation"
# vmware-player should not use virtual/libc as this is a
# precompiled binary package thats linked to glibc.
RDEPEND="sys-libs/glibc
amd64? (
app-emulation/emul-linux-x86-gtklibs )
x86? (
x11-libs/libXrandr
x11-libs/libXcursor
x11-libs/libXinerama
x11-libs/libXi
x11-libs/libXft )
>=dev-lang/perl-5
!app-emulation/vmware-workstation
!app-emulation/vmware-server
~app-emulation/vmware-modules-138.9
!<app-emulation/vmware-modules-138.9
!>app-emulation/vmware-modules-138.9
sys-apps/pciutils"
RUN_UPDATE="no"
dir=/opt/vmware/player
Ddir=${D}/${dir}
QA_TEXTRELS_x86="${dir:1}/lib/lib/libgdk-x11-2.0.so.0/libgdk-x11-2.0.so.0"
QA_EXECSTACK_x86="${dir:1}/bin/vmnet-bridge
${dir:1}/bin/vmnet-dhcpd
${dir:1}/bin/vmnet-natd
${dir:1}/bin/vmnet-netifup
${dir:1}/bin/vmnet-sniffer
${dir:1}/bin/vmware-ping
${dir:1}/lib/bin/vmware-vmx
${dir:1}/lib/bin/vmrun
${dir:1}/lib/bin/vmplayer
${dir:1}/lib/bin-debug/vmware-vmx
${dir:1}/lib/lib/libpixops.so.2.0.1/libpixops.so.2.0.1"
QA_TEXTRELS_amd64="${dir:1}/lib/lib/libgdk-x11-2.0.so.0/libgdk-x11-2.0.so.0"
QA_EXECSTACK_amd64="${dir:1}/bin/vmnet-bridge
${dir:1}/bin/vmnet-dhcpd
${dir:1}/bin/vmnet-natd
${dir:1}/bin/vmnet-netifup
${dir:1}/bin/vmnet-sniffer
${dir:1}/bin/vmware-ping
${dir:1}/lib/bin/vmware-vmx
${dir:1}/lib/bin/vmrun
${dir:1}/lib/bin/vmplayer
${dir:1}/lib/bin-debug/vmware-vmx
${dir:1}/lib/lib/libpixops.so.2.0.1/libpixops.so.2.0.1"
src_install() {
vmware_src_install
make_desktop_entry vmplayer "VMware Player" ${PN}.png System
}

View File

@ -1,170 +0,0 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-2.5.3.185404.ebuild,v 1.4 2009/09/25 10:37:05 maekke Exp $
EAPI="2"
inherit eutils versionator fdo-mime gnome2-utils
MY_PN="VMware-Player-$(replace_version_separator 3 - $PV)"
DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html"
SRC_URI="
x86? ( mirror://vmware/software/vmplayer/${MY_PN}.i386.bundle )
amd64? ( mirror://vmware/software/vmplayer/${MY_PN}.x86_64.bundle )
"
LICENSE="vmware"
SLOT="0"
KEYWORDS="-* amd64 x86"
IUSE=""
RESTRICT="strip binchecks"
# vmware-workstation should not use virtual/libc as this is a
# precompiled binary package thats linked to glibc.
DEPEND=">=dev-lang/python-2.5[sqlite,ncurses]
dev-python/lxml"
RDEPEND="
~app-emulation/vmware-modules-209.3
!>app-emulation/vmware-modules-209.3
!<app-emulation/vmware-modules-209.3
dev-cpp/cairomm
dev-cpp/libgnomecanvasmm
dev-cpp/libsexymm
sys-libs/glibc
sys-apps/pciutils
>=x11-libs/libview-0.6.2
x11-libs/libXcursor
x11-libs/libXft
x11-libs/libXi
x11-libs/libXinerama
x11-libs/libXrandr
!app-emulation/vmware-server
!app-emulation/vmware-workstation
"
S=${WORKDIR}/vmware-distrib
VM_INSTALL_DIR="/opt/vmware/player"
pkg_setup() {
if use x86; then
MY_P="${MY_PN}.i386"
elif use amd64; then
MY_P="${MY_PN}.x86_64"
fi
if [ "$(python -c "import curses; curses.setupterm(); print curses.tigetstr('hpa')")" == "None" ]; then
die "Please emerge this package using a different terminal (e.g. not within screen)."
fi
}
pkg_nofetch() {
if use x86; then
MY_P="${MY_PN}.i386"
elif use amd64; then
MY_P="${MY_PN}.x86_64"
fi
einfo "Please download the ${MY_P}.bundle from ${HOMEPAGE}"
}
src_unpack() {
# Unbundle the bundle
cp "${FILESDIR}"/helpers/* "${WORKDIR}"
chmod a+x "${WORKDIR}"/*.sh
"${WORKDIR}"/unbundler.sh "${DISTDIR}/${MY_P}".bundle
}
src_prepare() {
# Patch up the installer
epatch "${FILESDIR}/${P}-installer.patch"
mkdir "${WORKDIR}/vmware-confdir"
}
src_install() {
dodir /etc/init.d
#Run the installer
local INSTALLER="${WORKDIR}/payload/install/vmware-installer"
local PYOPTS="-W ignore::DeprecationWarning"
export VMWARE_SKIP_NETWORKING="true"
python ${PYOPTS} "${INSTALLER}/vmware-installer.py" \
--set-setting vmware-installer.libconf "${INSTALLER}/lib/libconf" \
--set-setting initdir "${T}" \
--set-setting initscriptdir "${D}/etc/init.d" \
--set-setting prefix "${D}${VM_INSTALL_DIR}" \
--set-setting sysconfdir "${D}/etc" \
--install-component "${INSTALLER}" \
--install-bundle "${DISTDIR}/${MY_P}.bundle" \
--console --required
rm -fr "${D}${VM_INSTALL_DIR}/lib/vmware/modules/binary"
if [ ! -e "${WORKDIR}"/vmware-confdir/bootstrap ]; then
eerror "VMware installation seems to have rolled back."
eerror "Please include the contents of ${WORKDIR}/vmware-installer.log"
eerror "in any bug reports you file."
die "VMware installation rolled back."
fi
# Redirect all the ${D} paths to / paths"
sed -i -e "s:${D}::" "${WORKDIR}"/vmware-confdir/bootstrap
# Fix up icons/mime/desktop handlers
dodir /usr/share/
mv "${D}${VM_INSTALL_DIR}"/share/applications "${D}"/usr/share/
rm -f "${D}${VM_INSTALL_DIR}"/share/icons/hicolor/{icon-theme.cache,index.theme}
mv "${D}${VM_INSTALL_DIR}"/share/icons "${D}"/usr/share/
dodir /usr/share/mime
mv "${D}${VM_INSTALL_DIR}"/share/mime/packages "${D}"/usr/share/mime
sed -i -e "s:${D}::" "${D}"/usr/share/applications/*.desktop
# Copy across the temporary /etc/vmware directory
dodir /etc/vmware/init.d
cp -r "${WORKDIR}"/vmware-confdir/* "${D}/etc/vmware"
mv "${D}"/etc/init.d/* "${D}/etc/vmware/init.d"
sed -i -e "s:/sbin/lsmod:/bin/lsmod:" "${D}"/etc/vmware/init.d/vmware
newinitd "${FILESDIR}/${PN}"-2.5.rc vmware
touch "${D}"/etc/vmware/networking
# Setup the path environment
insinto /etc/env.d
doins "${FILESDIR}/90${PN}"
# Fix some paths to allow included gtk to work
for i in "/etc/pango/pangorc" \
"/etc/pango/pango.modules" \
"/etc/gtk-2.0/gtk.immodules" \
"/etc/gtk-2.0/gdk-pixbuf.loaders" ; do
sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf${i} ;
sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/installer/lib/libconf${i} ;
done
}
pkg_config() {
${VM_INSTALL_DIR}/bin/vmware-networks --postinstall ${PN},old,new
}
pkg_preinst() {
gnome2_icon_savelist
}
pkg_postinst() {
fdo-mime_desktop_database_update
gnome2_icon_cache_update
ewarn "Before you can use vmware-player, you must configure a default network setup."
ewarn "You can do this by running 'emerge --config ${PN}'."
}
pkg_prerm() {
einfo "Stopping ${product_name} for safe unmerge"
/etc/init.d/vmware stop
}
pkg_postrm() {
fdo-mime_desktop_database_update
gnome2_icon_cache_update
}

View File

@ -1,174 +0,0 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-player/vmware-player-2.5.3.185404.ebuild,v 1.4 2009/09/25 10:37:05 maekke Exp $
EAPI="2"
inherit eutils versionator fdo-mime gnome2-utils
MY_PN="VMware-Player-$(replace_version_separator 3 - $PV)"
DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators"
HOMEPAGE="http://www.vmware.com/products/desktop/ws_features.html"
SRC_URI="
x86? ( mirror://vmware/software/vmplayer/${MY_PN}.i386.bundle )
amd64? ( mirror://vmware/software/vmplayer/${MY_PN}.x86_64.bundle )
"
LICENSE="vmware"
SLOT="0"
KEYWORDS="-* amd64 x86"
IUSE=""
RESTRICT="strip binchecks"
# vmware-workstation should not use virtual/libc as this is a
# precompiled binary package thats linked to glibc.
DEPEND=">=dev-lang/python-2.5[sqlite,ncurses]
dev-python/lxml"
RDEPEND="
~app-emulation/vmware-modules-209.3
!>app-emulation/vmware-modules-209.3
!<app-emulation/vmware-modules-209.3
dev-cpp/cairomm
dev-cpp/libgnomecanvasmm
dev-cpp/libsexymm
sys-libs/glibc
sys-apps/pciutils
>=x11-libs/libview-0.6.2
x11-libs/libXcursor
x11-libs/libXft
x11-libs/libXi
x11-libs/libXinerama
x11-libs/libXrandr
!app-emulation/vmware-server
!app-emulation/vmware-workstation
"
S=${WORKDIR}/vmware-distrib
VM_INSTALL_DIR="/opt/vmware/player"
pkg_setup() {
if use x86; then
MY_P="${MY_PN}.i386"
elif use amd64; then
MY_P="${MY_PN}.x86_64"
fi
if [ "$(python -c "import curses; curses.setupterm(); print curses.tigetstr('hpa')")" == "None" ]; then
die "Please emerge this package using a different terminal (e.g. not within screen)."
fi
}
pkg_nofetch() {
if use x86; then
MY_P="${MY_PN}.i386"
elif use amd64; then
MY_P="${MY_PN}.x86_64"
fi
einfo "Please download the ${MY_P}.bundle from ${HOMEPAGE}"
}
src_unpack() {
# Unbundle the bundle
cp "${FILESDIR}"/helpers/* "${WORKDIR}"
chmod a+x "${WORKDIR}"/*.sh
"${WORKDIR}"/unbundler.sh "${DISTDIR}/${MY_P}".bundle
}
src_prepare() {
# Patch up the installer
epatch "${FILESDIR}/${P}-installer.patch"
local INSTALLER="${WORKDIR}/payload/install/vmware-installer"
cp ${INSTALLER}/bootstrap ${WORKDIR}/bootstrap
sed -i -e "s,@@VMWARE_INSTALLER@@,${INSTALLER},g" ${WORKDIR}/bootstrap
mkdir "${WORKDIR}/vmware-confdir"
}
src_install() {
dodir /etc/init.d
#Run the installer
local INSTALLER="${WORKDIR}/payload/install/vmware-installer"
local PYOPTS="-W ignore::DeprecationWarning"
export VMWARE_SKIP_NETWORKING="true"
export VMWARE_BOOTSTRAP="${WORKDIR}/bootstrap"
"${INSTALLER}/vmware-installer" \
--set-setting vmware-installer libconf "${INSTALLER}/lib/libconf" \
--set-setting initdir "${T}" \
--set-setting initscriptdir "${D}/etc/init.d" \
--set-setting prefix "${D}${VM_INSTALL_DIR}" \
--set-setting sysconfdir "${D}/etc" \
--install-component "${INSTALLER}" \
--install-bundle "${DISTDIR}/${MY_P}.bundle" \
--console --required
rm -fr "${D}${VM_INSTALL_DIR}/lib/vmware/modules/binary"
if [ ! -e "${WORKDIR}"/vmware-confdir/bootstrap ]; then
eerror "VMware installation seems to have rolled back."
eerror "Please include the contents of ${WORKDIR}/vmware-installer.log"
eerror "in any bug reports you file."
die "VMware installation rolled back."
fi
# Redirect all the ${D} paths to / paths"
sed -i -e "s:${D}::" "${WORKDIR}"/vmware-confdir/bootstrap
# Fix up icons/mime/desktop handlers
dodir /usr/share/
mv "${D}${VM_INSTALL_DIR}"/share/applications "${D}"/usr/share/
rm -f "${D}${VM_INSTALL_DIR}"/share/icons/hicolor/{icon-theme.cache,index.theme}
mv "${D}${VM_INSTALL_DIR}"/share/icons "${D}"/usr/share/
dodir /usr/share/mime
mv "${D}${VM_INSTALL_DIR}"/share/mime/packages "${D}"/usr/share/mime
sed -i -e "s:${D}::" "${D}"/usr/share/applications/*.desktop
# Copy across the temporary /etc/vmware directory
dodir /etc/vmware/init.d
cp -r "${WORKDIR}"/vmware-confdir/* "${D}/etc/vmware"
mv "${D}"/etc/init.d/* "${D}/etc/vmware/init.d"
sed -i -e "s:/sbin/lsmod:/bin/lsmod:" "${D}"/etc/vmware/init.d/vmware
newinitd "${FILESDIR}/${PN}"-2.5.rc vmware
touch "${D}"/etc/vmware/networking
# Setup the path environment
insinto /etc/env.d
doins "${FILESDIR}/90${PN}"
# Fix some paths to allow included gtk to work
for i in "/etc/pango/pangorc" \
"/etc/pango/pango.modules" \
"/etc/gtk-2.0/gtk.immodules" \
"/etc/gtk-2.0/gdk-pixbuf.loaders" ; do
sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf${i} ;
sed -i -e "s:${D}::" "${D}${VM_INSTALL_DIR}"/lib/vmware/installer/lib/libconf${i} ;
done
}
pkg_config() {
${VM_INSTALL_DIR}/bin/vmware-networks --postinstall ${PN},old,new
}
pkg_preinst() {
gnome2_icon_savelist
}
pkg_postinst() {
fdo-mime_desktop_database_update
gnome2_icon_cache_update
ewarn "Before you can use vmware-player, you must configure a default network setup."
ewarn "You can do this by running 'emerge --config ${PN}'."
}
pkg_prerm() {
einfo "Stopping ${product_name} for safe unmerge"
/etc/init.d/vmware stop
}
pkg_postrm() {
fdo-mime_desktop_database_update
gnome2_icon_cache_update
}

View File

@ -1,98 +1,10 @@
# ChangeLog for app-emulation/vmware-server
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/ChangeLog,v 1.61 2009/12/18 16:14:42 vadimk Exp $
# $Header: $
19 Nov 2011; Mario Fetka <mario.fetka@gmail.com>
-vmware-server-1.0.8.126538.ebuild, -vmware-server-1.0.9.156507.ebuild,
-vmware-server-1.0.10.203137.ebuild, vmware-server-1.0.10.203137-r1.ebuild,
-vmware-server-2.0.2.203138.ebuild, -vmware-server-2.0.2.203138-r1.ebuild:
cleanup
*vmware-server-2.0.2.203138-r4 (24 Mar 2011)
06 Dec 2010; Mario Fetka <mario.fetka@gmail.com>
vmware-server-1.0.10.203137-r1.ebuild:
dont set automatically
05 Dec 2010; Mario Fetka <mario.fetka@gmail.com>
vmware-server-1.0.10.203137-r1.ebuild, vmware-server-2.0.2.203138-r2.ebuild:
add clock fix
*vmware-server-2.0.2.203138-r2 (05 Dec 2010)
05 Dec 2010; Mario Fetka <mario.fetka@gmail.com>
+vmware-server-2.0.2.203138-r2.ebuild, files/vmware-server-2.rc:
bump release to be greater then in portage
19 Aug 2010; Mario Fetka <mario.fetka@gmail.com>
+vmware-server-1.0.10.203137-r1.ebuild:
add proprt lsmod path
19 Aug 2010; Mario Fetka <mario.fetka@gmail.com>
vmware-server-1.0.10.203137.ebuild, files/vmware-server-2.rc:
Bump
19 Aug 2010; Mario Fetka <mario.fetka@gmail.com>
vmware-server-1.0.8.126538.ebuild, vmware-server-1.0.10.203137.ebuild,
vmware-server-2.0.2.203138.ebuild, +vmware-server-2.0.2.203138-r1.ebuild:
Bump
26 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
vmware-server-1.0.8.126538.ebuild, vmware-server-1.0.9.156507.ebuild,
vmware-server-1.0.10.203137.ebuild:
correct dependency
24 Dec 2009; Mario Fetka <mario.fetka@gmail.com> -files/2.0.1.156745,
-files/2.0.1.156745/000_all_initd-location.patch,
-files/2.0.1.156745/001_all_fix-permissions.patch,
-files/2.0.1.156745/002_all_pagebreak-detection-fix.patch,
-files/2.0.1.156745/004_all_do-not-build-modules.patch,
-files/2.0.1.156745/007_all_use-modprobe-over-insmod.patch,
-files/2.0.1.156745/009_all_init.d-modules-warning.patch,
-files/2.0.1.156745/011_all_legit-modules-only.patch,
-files/2.0.1.156745/012_all_rc-config.patch:
delete old files
24 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
+vmware-server-1.0.8.126538.ebuild,
+files/2.0.1.156745/000_all_initd-location.patch,
+files/2.0.1.156745/002_all_pagebreak-detection-fix.patch,
+files/2.0.2.203138, +vmware-server-1.0.9.156507.ebuild,
+files/2.0.1.156745/001_all_fix-permissions.patch,
+files/2.0.1.156745/004_all_do-not-build-modules.patch,
+files/2.0.2.203138/000_all_initd-location.patch,
+vmware-server-1.0.10.203137.ebuild,
+files/2.0.1.156745/007_all_use-modprobe-over-insmod.patch,
+files/2.0.1.156745/009_all_init.d-modules-warning.patch,
+files/2.0.1.156745/011_all_legit-modules-only.patch,
+files/2.0.2.203138/001_all_fix-permissions.patch,
files/vmware-server-2.rc, +files/2.0.1.156745,
+files/2.0.1.156745/012_all_rc-config.patch,
+files/2.0.2.203138/002_all_pagebreak-detection-fix.patch,
+files/2.0.2.203138/004_all_do-not-build-modules.patch,
+files/2.0.2.203138/007_all_use-modprobe-over-insmod.patch,
+files/2.0.2.203138/011_all_legit-modules-only.patch,
+files/2.0.2.203138/012_all_rc-config.patch,
-vmware-server-1.0.9_p156507.ebuild,
+files/2.0.2.203138/009_all_init.d-modules-warning.patch, +files/general,
+files/general/001_all_no-desktop-icon.patch,
+files/general/002_all_allow-write-access-to-config.patch,
+files/general/004_all_do-not-build-modules.patch,
+files/general/005_all_do-not-overwrite-authd-file.patch,
+files/general/008_all_dhcpd-conf-location.patch,
+vmware-server-2.0.2.203138.ebuild,
+files/general/006_all_xinetd-sendsig-if-possible.patch,
+files/general/007_all_use-modprobe-over-insmod.patch,
+files/general/009_all_init.d-modules-warning.patch, metadata.xml:
depend on my kernel modules
*vmware-server-1.0.10.203137 (18 Dec 2009)
18 Dec 2009; Vadim Kuznetsov <vadimk@gentoo.org>
+vmware-server-1.0.10.203137.ebuild:
Bug 297367
*vmware-server-2.0.2.203138 (29 Oct 2009)
29 Oct 2009; Vadim Kuznetsov vadimk@gentoo.org
24 Mar 2011; Vadim Kuznetsov <vadimk@gentoo.org> files/vmware-server-2.rc,
+files/2.0.2.203138/000_all_initd-location.patch,
+files/2.0.2.203138/001_all_fix-permissions.patch,
+files/2.0.2.203138/002_all_pagebreak-detection-fix.patch,
@ -100,308 +12,8 @@
+files/2.0.2.203138/007_all_use-modprobe-over-insmod.patch,
+files/2.0.2.203138/009_all_init.d-modules-warning.patch,
+files/2.0.2.203138/011_all_legit-modules-only.patch,
-vmware-server-2.0.1.156745.ebuild, -vmware-server-2.0.1.156745-r1.ebuild,
+vmware-server-2.0.2.203138.ebuild,
+vmware-server-2.0.2.203138-r4.ebuild,
+files/2.0.2.203138/012_all_rc-config.patch,
-vmware-server-2.0.1.156745-r2.ebuild:
version bump. Bug 290702
*vmware-server-2.0.1.156745-r3 (22 Sep 2009)
22 Sep 2009; Vadim Kuznetsov vadimk@gentoo.org
+vmware-server-2.0.1.156745-r3.ebuild:
Bug 282213.
01 Aug 2009; Markus Meier <maekke@gentoo.org>
vmware-server-1.0.9.156507.ebuild:
amd64 stable, bug #265139
08 Jul 2009; Vadim Kuznetsov vadimk@gentoo.org
vmware-server-2.0.1.156745-r2.ebuild:
pkg_prerm is added for safe unmerge. init script is loading vmci module.
*vmware-server-2.0.1.156745-r2 (06 Jul 2009)
06 Jul 2009; Vadim Kuznetsov vadimk@gentoo.org
+files/2.0.1.156745/012_all_rc-config.patch,
+vmware-server-2.0.1.156745-r2.ebuild, metadata.xml:
New streamlined ebuild without vmware eclass and with some improvements:
rc-config, pam, vix. Fixes bug 263560
25 Jun 2009; Christian Faulhammer <fauli@gentoo.org>
vmware-server-1.0.9.156507.ebuild:
stable x86, security bug 265139
*vmware-server-2.0.1.156745-r1 (14 Jun 2009)
14 Jun 2009; Vadim Kuznetsov vadimk@gentoo.org
+vmware-server-2.0.1.156745-r1.ebuild, metadata.xml:
Bug 273750.
09 Jun 2009; Vadim Kuznetsov vadimk@gentoo.org
vmware-server-2.0.1.156745.ebuild, metadata.xml:
Bug 271245. No more /sbin/lsmod link after module-init-tools version bump.
*vmware-server-2.0.1.156745 (09 May 2009)
*vmware-server-1.0.9.156507 (09 May 2009)
09 May 2009; Mike Auty <ikelos@gentoo.org> +files/vmware-server-2.rc,
+files/2.0.1.156745/000_all_initd-location.patch,
+files/2.0.1.156745/001_all_fix-permissions.patch,
+files/2.0.1.156745/002_all_pagebreak-detection-fix.patch,
+files/2.0.1.156745/004_all_do-not-build-modules.patch,
+files/2.0.1.156745/007_all_use-modprobe-over-insmod.patch,
+vmware-server-2.0.1.156745.ebuild,
+files/2.0.1.156745/009_all_init.d-modules-warning.patch,
+files/2.0.1.156745/011_all_legit-modules-only.patch,
+vmware-server-1.0.9.156507.ebuild, +files/authorization.xml:
Bump vmware-server and add in version 2.
22 Feb 2009; Mike Auty <ikelos@gentoo.org>
-vmware-server-1.0.5.80187.ebuild, -vmware-server-1.0.6.91891.ebuild,
-vmware-server-1.0.7.108231.ebuild:
Clear out old insecure versions of vmware-server (bug 245941).
12 Jan 2009; Markus Meier <maekke@gentoo.org>
vmware-server-1.0.8.126538.ebuild:
amd64/x86 stable, bug #245941
11 Jan 2009; Markus Meier <maekke@gentoo.org>
vmware-server-1.0.7.108231.ebuild:
amd64/x86 stable, bug #236167
04 Jan 2009; Ulrich Mueller <ulm@gentoo.org>
vmware-server-1.0.5.80187.ebuild, vmware-server-1.0.6.91891.ebuild,
vmware-server-1.0.7.108231.ebuild, vmware-server-1.0.8.126538.ebuild:
Change virtual/xft dependency to x11-libs/libXft, bug 253771.
*vmware-server-1.0.8.126538 (09 Nov 2008)
09 Nov 2008; Mike Auty <ikelos@gentoo.org>
+vmware-server-1.0.8.126538.ebuild:
Add in vmware-server-1.0.8 for bug 245941.
*vmware-server-1.0.7.108231 (30 Sep 2008)
30 Sep 2008; Mike Auty <ikelos@gentoo.org>
+vmware-server-1.0.7.108231.ebuild:
Bump vmware-server to 1.0.7.
03 Jul 2008; Christian Faulhammer <opfer@gentoo.org>
vmware-server-1.0.6.91891.ebuild:
stable x86, security bug 224637
17 Jun 2008; Richard Freeman <rich0@gentoo.org>
vmware-server-1.0.6.91891.ebuild:
amd64 stable - 224637
16 Jun 2008; Christian Faulhammer <opfer@gentoo.org> ChangeLog:
app-emulation/vmware-workstation-5.5.7.91707 stable, bug #x86
*vmware-server-1.0.6.91891 (14 Jun 2008)
14 Jun 2008; Mike Auty <ikelos@gentoo.org> -vmware-server-1.0.4.56528.ebuild,
+vmware-server-1.0.6.91891.ebuild:
Version bump for bug 224637. Also clear out old version.
07 May 2008; Christian Faulhammer <opfer@gentoo.org> ChangeLog:
stable x86, bug 213548
26 Apr 2008; Mike Auty <ikelos@gentoo.org> Manifest:
Removing old masked vmware-server ebuild.
04 Apr 2008; Christian Faulhammer <opfer@gentoo.org>
vmware-server-1.0.5.80187.ebuild:
stable x86, bug 215034
29 Mar 2008; Richard Freeman <rich0@gentoo.org>
vmware-server-1.0.5.80187.ebuild:
amd64 stable - 215034
*vmware-server-1.0.5.80187 (22 Mar 2008)
22 Mar 2008; Mike Auty <ikelos@gentoo.org>
+vmware-server-1.0.5.80187.ebuild:
Version bump, to fix bug 213548.
26 Feb 2008; Richard Freeman <rich0@gentoo.org>
vmware-server-1.0.4.56528.ebuild:
amd64 stable - 211016
22 Feb 2008; Christian Faulhammer <opfer@gentoo.org>
vmware-server-1.0.4.56528.ebuild:
stable x86, bug 211016
31 Jan 2008; Mike Auty <ikelos@gentoo.org> ChangeLog:
Re-sign digestless manifest.
26 Jan 2008; Mike Auty <ikelos@gentoo.org>
vmware-server-1.0.3.44356.ebuild, vmware-server-1.0.4.56528.ebuild:
Remove the need for redigesting after any-any-updates.
26 Jan 2008; Mike Auty <ikelos@gentoo.org>
files/digest-vmware-server-1.0.3.44356,
files/digest-vmware-server-1.0.4.56528, Manifest:
Redigest for any-any-update115.
25 Nov 2007; Mike Auty <ikelos@gentoo.org>
files/digest-vmware-server-1.0.3.44356,
files/digest-vmware-server-1.0.4.56528, Manifest:
Update to vmware-any-any-update114.
15 Oct 2007; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-server-1.0.3.44356.ebuild, vmware-server-1.0.4.56528.ebuild:
Typo fix in amd64 check. Thanks to Daniel Robbins <drobbins@funtoo.org> for
pointing it out.
*vmware-server-1.0.4.56528 (20 Sep 2007)
20 Sep 2007; Mike Auty <ikelos@gentoo.org> files/vmware-server.rc,
+vmware-server-1.0.4.56528.ebuild:
Version bump for security issues (bug 193196).
16 Sep 2007; Mike Auty <ikelos@gentoo.org> files/vmware-authd,
files/vmware-server.rc, vmware-server-1.0.3.44356.ebuild:
Fix up PAM issues on amd64, add vmware-modules blockers and fix init script
for baselayout-2 and dash.
28 Jul 2007; Mike Auty <ikelos@gentoo.org>
files/digest-vmware-server-1.0.3.44356, Manifest:
Redigest for vmware-any-any-update112.
13 Jul 2007; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-server-1.0.3.44356.ebuild:
Added another mirror for the vmware-any-any-update patchset.
02 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
vmware-server-1.0.3.44356.ebuild:
(QA) RESTRICT clean up.
*vmware-server-1.0.3.44356 (07 May 2007)
07 May 2007; Mike Auty <ikelos@gentoo.org>
-vmware-server-1.0.1.29996-r5.ebuild, -vmware-server-1.0.2.39867.ebuild,
+vmware-server-1.0.3.44356.ebuild:
Version bump to 1.0.3, security/maintenance release so removing old versions.
28 Apr 2007; Mike Auty <ikelos@gentoo.org> files/vmware-server.rc:
Redigest for vmware-any-any109, and fix rc file for baselayout-2.
09 Apr 2007; Mike Auty <ikelos@gentoo.org> files/vmware-server.rc:
Fix vmware-server.rc for bug 173752.
07 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org>
files/vmware-server.rc:
Change all instances of [ to [[.
*vmware-server-1.0.2.39867 (04 Mar 2007)
04 Mar 2007; Mike Auty <ikelos@gentoo.org>
-vmware-server-1.0.1.29996-r4.ebuild, +vmware-server-1.0.2.39867.ebuild:
Version bump.
05 Feb 2007; Mike Auty <ikelos@gentoo.org>
files/digest-vmware-server-1.0.1.29996-r4,
files/digest-vmware-server-1.0.1.29996-r5, Manifest:
Vmware-any-any bump to support 2.6.20.
09 Jan 2007; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-server-1.0.1.29996-r5.ebuild:
Cleaning up after Piotr Jaroszyński <peper@gentoo.org> and making sure we
have the right minimum version of baselibs for the new revision.
*vmware-server-1.0.1.29996-r5 (09 Jan 2007)
09 Jan 2007; Piotr Jaroszyński <peper@gentoo.org>
+vmware-server-1.0.1.29996-r5.ebuild:
Fix to work with new emul-linux-* packages, bug #160929.
05 Jan 2007; Mike Auty <ikelos@gentoo.org>
files/general/007_all_use-modprobe-over-insmod.patch,
vmware-server-1.0.1.29996-r4.ebuild:
Fixing einfo/elog statements, and removing force flag from modprobe patch.
14 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-server-1.0.1.29996-r4.ebuild:
Fixed typo for bug #158134.
01 Dec 2006; Mike Auty <ikelos@gentoo.org>
files/digest-vmware-server-1.0.1.29996-r4, Manifest:
Redigest for vmware-any-any105.
30 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-server-1.0.1.29996-r4.ebuild:
Removed dependencies on the old virtual/x11.
*vmware-server-1.0.1.29996-r4 (04 Oct 2006)
04 Oct 2006; Mike Auty <ikelos@gentoo.org>
-vmware-server-1.0.1.29996-r3.ebuild,
+vmware-server-1.0.1.29996-r4.ebuild:
Final bump for openssl issues (hopefully).
*vmware-server-1.0.1.29996-r3 (03 Oct 2006)
03 Oct 2006; Mike Auty <ikelos@gentoo.org>
-vmware-server-1.0.1.29996-r2.ebuild,
+vmware-server-1.0.1.29996-r3.ebuild:
Another version bump to try and finally fix the openssl problems.
*vmware-server-1.0.1.29996-r2 (02 Oct 2006)
02 Oct 2006; Mike Auty <ikelos@gentoo.org>
-vmware-server-1.0.1.29996-r1.ebuild,
+vmware-server-1.0.1.29996-r2.ebuild:
Bump to fix openssl-0.9.7 issues.
30 Sep 2006; Mike Auty <ikelos@gentoo.org>
-files/digest-vmware-server-1.0.0.28343,
-files/digest-vmware-server-1.0.1.29996:
Cleaning up orphaned manifests.
*vmware-server-1.0.1.29996-r1 (27 Sep 2006)
27 Sep 2006; Mike Auty <ikelos@gentoo.org>
-vmware-server-1.0.0.28343.ebuild, -vmware-server-1.0.1.29996.ebuild,
+vmware-server-1.0.1.29996-r1.ebuild:
Revision bump to force an upgrade due to bug
25 Aug 2006; Mike Auty <ikelos@gentoo.org>
files/digest-vmware-server-1.0.0.28343,
files/digest-vmware-server-1.0.1.29996, Manifest:
Redigested for vmware-any-any-update104.
*vmware-server-1.0.1.29996 (19 Aug 2006)
19 Aug 2006; Mike Auty <ikelos@gentoo.org>
+vmware-server-1.0.1.29996.ebuild:
Version bump which fixes bug #144421, bug #141967 and bug #144166.
09 Aug 2006; Mike Auty <ikelos@gentoo.org>
vmware-server-1.0.0.28343.ebuild:
Alter ebuild so that the metadata cache is invalidated.
08 Aug 2006; Mike Auty <ikelos@gentoo.org>
files/digest-vmware-server-1.0.0.28343, Manifest:
New digests to work with vmware-any-any103, which fixes some problems with
the 2.6.18 kernel.
31 Jul 2006; Mike Auty <ikelos@gentoo.org>
vmware-server-1.0.0.28343.ebuild:
Alter the indentation and fix the modular X dependencies.
*vmware-server-1.0.0.28343 (31 Jul 2006)
31 Jul 2006; Mike Auty <ikelos@gentoo.org> +files/90vmware-server,
+files/general/001_all_no-desktop-icon.patch,
+files/general/002_all_allow-write-access-to-config.patch,
+files/general/004_all_do-not-build-modules.patch,
+files/general/005_all_do-not-overwrite-authd-file.patch,
+files/general/006_all_xinetd-sendsig-if-possible.patch,
+files/general/007_all_use-modprobe-over-insmod.patch,
+files/general/008_all_dhcpd-conf-location.patch,
+files/general/009_all_init.d-modules-warning.patch, +files/vmware-authd,
+files/vmware-server.rc, +files/vmware-server.xml, +metadata.xml,
+vmware-server-1.0.0.28343.ebuild:
Initial commit of vmware-server.
+files/2.0.2.203138/014_all_uninstall.patch:
removed hald dependency

View File

@ -6,6 +6,7 @@ AUX 2.0.2.203138/007_all_use-modprobe-over-insmod.patch 343 RMD160 ef4007c98c834
AUX 2.0.2.203138/009_all_init.d-modules-warning.patch 965 RMD160 3a98d59bb591aa6498a7dca9751f441b430c6288 SHA1 5b6b1c1330d1108bb769107c73fdc43c1fe46be5 SHA256 dbeb12905d75f06be519cc99e6e0c070b6e08e34cdb813c518b09a04b55876fb
AUX 2.0.2.203138/011_all_legit-modules-only.patch 535 RMD160 de7fa6a29bf9f7e6670de53fd2dfdc842ec7a097 SHA1 9bd34078eeb012cec94eaac4ab9d899ad4244ca1 SHA256 ed15e9e237bf69dc5ef7803db53011d06b84525d5df6754afa54290d1677f794
AUX 2.0.2.203138/012_all_rc-config.patch 867 RMD160 b88448d21d361468c2e30863abf2dfac3b71c10e SHA1 5cd66235af794a57e5d982ffb93122999666dbc0 SHA256 a1ef415a5d036efb5846d80a1b0475d56c2bc2f608a4099bd04a1445ace22761
AUX 2.0.2.203138/014_all_uninstall.patch 516 RMD160 d81d46b67edb0f769538cacfdd4a9cd6d022ec1a SHA1 f342874cd8fc53f6bc944835c5d6b16da974a626 SHA256 8df93ec7724a3509b5d71758dfb2804816a2b89e418b75f7c51fa4cc68ffcc67
AUX 90vmware-server 91 RMD160 2a9e2e9d428a06ceac7faec500e6b1423da34b25 SHA1 e090847500dd99d161a46cd361ed2297b3d3ecae SHA256 3175cd9665850cf0d25a96849135c93ab129127370d55572f0137ba3d210e423
AUX authorization.xml 332 RMD160 f31f4300342a9290634e20187351910d72e7c28d SHA1 28e2b07ed7225c83bef3172d23d4702fe92a3f75 SHA256 a6ce67bb812ca67d26e518da4903cf27338865c0f06beb58d4a8ece6021e1630
AUX general/001_all_no-desktop-icon.patch 1131 RMD160 3ab69d825994cc3bb177143d27091fc292cec46a SHA1 14264460c8500f1ead267059e2b9b9a5dc8c057f SHA256 b4055370b0092e71a2b2b0f27edeb7bc063ad265f95ab4530e52c3ab3167ad62
@ -17,14 +18,14 @@ AUX general/007_all_use-modprobe-over-insmod.patch 445 RMD160 186ab443a733276a70
AUX general/008_all_dhcpd-conf-location.patch 382 RMD160 6b0c1a3571fb0d7bc537930d9a77fb4d960aa104 SHA1 344da932ea8652d85028d4f17a3a66afd90c01b7 SHA256 577454af27bc9107220055f9d8b93b40e31650c205d31d5a351c5a1ecc16d658
AUX general/009_all_init.d-modules-warning.patch 991 RMD160 6205e976db47cd3361b5eca8593414d411a2ab8d SHA1 3742749baa606a57d447931f0af791696a49e660 SHA256 5fbc9f101abb3816a732f64a75e90ce7fcb6783c3cd7bae521d8785e88634498
AUX vmware-authd 211 RMD160 1bd60030f6f7bb78c0fd3b6d156498121d4be5d4 SHA1 514538222dc4e665e1d450e1bf9bf1d8e03a2b61 SHA256 3eafe9ac10aeac852faa1fbbccb5c525560e358f69964995c5cfb86c53af6b54
AUX vmware-server-2.rc 1563 RMD160 dc3b5e2e2e6b89486d093f0f5a2b479d8b6525c9 SHA1 aeb3b2b3de89d5a80e8e7b9ec02d2c77c8dd3f2d SHA256 3c9ecd51bc8db1d636bea3db295d62cfe28941a9ffe2c971a2ac96481c698bad
AUX vmware-server-2.rc 1444 RMD160 d3e6ee3ddbe9d51691862a186acc3ce0789c4af1 SHA1 df33441cf8caf03adfa2c5cd23c31044dca3d439 SHA256 9096785bec623ea1e905e4c4284f1dfe292eb9a60690c5cbcc437a5b5198055d
AUX vmware-server.rc 1529 RMD160 d6840024f8c7be0a673e5e29660cc75fea9520d8 SHA1 049cf33eb5bac09415f8e2a85f7ecfd0bbc5ab4a SHA256 ef551e4240eea88184c96e286354a53a4983ce80c3332a127767301b42586cb2
AUX vmware-server.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d
DIST VMware-server-1.0.10-203137.tar.gz 107183610 RMD160 0ddaa6a6f5b3c08804eb1b97f13ffd0fc0b87876 SHA1 f21ed65a500b2176166d90ed2821892ce1cb1fd5 SHA256 744d6057daeea5f9a950d164a3d9c5ca6273feed645699cfcf16d8acbcfa504c
DIST VMware-server-2.0.2-203138.i386.tar.gz 506047036 RMD160 3119bf56e1ef9c63dfcb969d951cd78bd9c667e1 SHA1 2917c8d4e521cb9af186be8fcaf2043b1a516a6c SHA256 b4779515e2a8ecc4d768c07f9264aeb94e45986262626a3a557466e77f371662
DIST VMware-server-2.0.2-203138.x86_64.tar.gz 474415801 RMD160 0778f78122ee6b701543df5885ad1e8d3325fb82 SHA1 b65d3d46dc947fc7995bda354c4947afabd23474 SHA256 a1230f43f6b668a751e9ce2c9d2f6a2c75e4d4cea88f583901f67dbd67412e25
DIST vmware-server-perl-fixed-rpath-libs.tar.bz2 73834 RMD160 7f64627b5b945e8d7dabe39c165a4b66b71fb4d3 SHA1 9d696750ca3ec92b31ca8112fd80dcd832494044 SHA256 c42299dd033187c67b45b739da66583fbd94cdcba745200b89a25ac96cd9364b
EBUILD vmware-server-1.0.10.203137-r1.ebuild 3695 RMD160 78ce4a0273dd8133159bf99ad863841e1c90df09 SHA1 ca74e42494c761eb2e4f961ea0c2295d4f343a6c SHA256 709e4681dce7c7f32e32f488ec8fc07e320eed66353f97d686f52eff6e40a64b
EBUILD vmware-server-2.0.2.203138-r2.ebuild 9827 RMD160 3a4d1f41313ed7206aa9cd516db39e51b0e16ad4 SHA1 f127dd7f6bcf88dff00296c28d25f92ed7591753 SHA256 7eb5306037a212fc59636e0071c8e0b77dc55568126e36b68aef00654415cf75
MISC ChangeLog 15500 RMD160 d6c51b0190a9022b0a3b931dd8aca926760997a4 SHA1 832b06c9157cb72e0e8ef56ac6f00b34bba06f30 SHA256 b138449fa5edb205543f179d5d24ad16cee9de077c12c323231b895b932d86ec
MISC metadata.xml 451 RMD160 34ad07edf6d4f6d9b00b8c0ea197fa8ddad2397b SHA1 7983215b3da6bbfb2e5c167b33b0625a5a31280d SHA256 b64b12ed17797856c0f950540b92f134ca8ffafd40eabafb4ef90c889e16a3e3
EBUILD vmware-server-1.0.10.203137-r1.ebuild 2894 RMD160 c0dd0133c2b2c296b40299092fca94282e4a5d32 SHA1 47abd4891c48e49824526ac2ee167be4a7ba84af SHA256 c38b3680f4d8fe32dba60cda40ae736db9c56988a927066d673c0f3e11fae1d9
EBUILD vmware-server-2.0.2.203138-r4.ebuild 8745 RMD160 7745e567492aacf4df59b2881f15230dff83ad37 SHA1 686bb31bd9ef5d00dcb6840b8e079eab0f76061f SHA256 db1449936f09d08582e84c8fcebec8793e7fbfdf58ffe3c1950fedda944a26f6
MISC ChangeLog 815 RMD160 393225a479c0ea208c3d6f63c28a68a670ed0432 SHA1 ef761a5935dc9bae2a656f4818bd849e2be131de SHA256 c7199722e7b68996b8dd0376e7e0bf70b1bdb5e85aa8bb4e6f048156e9c37221
MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215

View File

@ -0,0 +1,19 @@
diff --git a/bin/vmware-config.pl b/bin/vmware-config.pl
index def4df8..9f6d6b7 100755
--- a/bin/vmware-config.pl
+++ b/bin/vmware-config.pl
@@ -2280,10 +2280,10 @@ sub db_get_files_to_restore {
sub uninstall_file {
my $file = shift;
- if (not db_file_in($file)) {
- # Not installed by this program
- return;
- }
+ #if (not db_file_in($file)) {
+ # # Not installed by this program
+ # return;
+ #}
if (file_name_exist($file)) {
if (file_changed_db_ts($file) || db_userfile_in($file)) {

View File

@ -1,10 +1,10 @@
#!/sbin/runscript
# Copyright 1999-2010 Gentoo Foundation
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/files/vmware-server-2.rc,v 1.1 2009/05/09 21:55:17 ikelos Exp $
# $Header: $
depend() {
need localmount hald
need localmount
use logger net
after samba
}

View File

@ -1,13 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>vmware</herd>
<maintainer>
<email>vadimk@gentoo.org</email>
</maintainer>
<longdescription>
VMware Server is a hosted virtualization platform that installs like an
application on any existing server hardware and partitions a physical
server into multiple virtual machines.
</longdescription>
<herd>vmware</herd>
</pkgmetadata>

View File

@ -10,11 +10,11 @@ inherit eutils versionator vmware
MY_PV=$(replace_version_separator 3 '-' )
MY_P="VMware-server-${MY_PV}"
MY_SV=$(get_version_component_range 3 "${PV}")
DESCRIPTION="VMware Server for Linux"
HOMEPAGE="http://www.vmware.com/"
SRC_URI="mirror://vmware/software/vmserver/${MY_P}.tar.gz
http://dev.gentoo.org/~ikelos/devoverlay-distfiles/${PN}-perl-fixed-rpath-libs.tar.bz2
mirror://gentoo/${PN}-perl-fixed-rpath-libs.tar.bz2"
LICENSE="vmware"
@ -47,13 +47,12 @@ RDEPEND=">=sys-libs/glibc-2.3.5
!<sys-apps/dbus-0.62
!app-emulation/vmware-player
!app-emulation/vmware-workstation
~app-emulation/vmware-modules-138.10
!<app-emulation/vmware-modules-138.10
!>app-emulation/vmware-modules-138.10
sys-apps/pciutils
virtual/pam
sys-apps/xinetd"
PDEPEND="=app-emulation/vmware-modules-138.${MY_SV}*"
S=${WORKDIR}/vmware-server-distrib
RUN_UPDATE="no"
@ -62,21 +61,17 @@ PATCHES=("general")
src_unpack() {
EPATCH_SUFFIX="patch"
vmware-1_src_unpack
vmware_src_unpack
#cd "${WORKDIR}"
#unpack ${PN}-perl-fixed-rpath-libs.tar.bz2
# patch the vmware /etc/pam.d file to ensure that only
# vmware group members can log in
cp "${FILESDIR}/vmware-authd" "${S}/etc/pam.d/vmware-authd"
# Proper lsmod
sed -i -e "s:/sbin/lsmod:/bin/lsmod:" "${S}"/installer/services.sh || die "sed"
sed -i -e "s:/sbin/lsmod:/bin/lsmod:" "${S}"/lib/net-services.sh || die "sed"
}
src_install() {
vmware-1_src_install
vmware_src_install
# Fix the amd64 emulation pam stuff
use amd64 && dosed "s:pam_:/lib32/security/pam_:" ${config_dir}/pam.d/vmware-authd
@ -90,12 +85,11 @@ src_install() {
pkg_config() {
einfo "Running ${ROOT}${dir}/bin/vmware-config.pl"
einfo "on amd64 systems you may have to add -skipstopstart"
"${ROOT}${dir}/bin/vmware-config.pl"
}
pkg_postinst() {
vmware-1_pkg_postinst
vmware_pkg_postinst
elog "Remember by default xinetd only allows connections from localhost"
elog "To allow external users access to vmware-server you must edit"
elog " /etc/xinetd.d/vmware-authd"
@ -103,13 +97,4 @@ pkg_postinst() {
echo
ewarn "VMWare Server also has issues when running on a JFS filesystem. For more"
ewarn "information see http://bugs.gentoo.org/show_bug.cgi?id=122500#c94"
echo
elog "Adding clock modification:"
elog "(otherwise the guest os clock is to fast)"
elog "you can do it by adding the max host frequenzy to your /etc/vmware/config file"
elog "cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq"
elog "use the value to set host.cpukHz = .... in the config file"
elog "host.cpukHz = $(cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq)"
elog "host.noTSC = \"TRUE\""
elog "ptsc.noTSC = \"TRUE\""
}

View File

@ -1,4 +1,4 @@
# Copyright 1999-2010 Gentoo Foundation
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-server/vmware-server-2.0.2.203138-r1.ebuild,v 1.4 2010/05/13 22:33:47 vadimk Exp $
@ -16,14 +16,14 @@ MY_PN="VMware-server-${MY_PV}"
DESCRIPTION="VMware Server for Linux"
HOMEPAGE="http://www.vmware.com/"
DOWNLOAD_URL="http://downloads.vmware.com/d/info/datacenter_downloads/vmware_server/2_0"
SRC_URI=" x86? ( mirror://vmware/software/server/${MY_PN}.i386.tar.gz )
amd64? ( mirror://vmware/software/server/${MY_PN}.x86_64.tar.gz ) "
SRC_URI=" x86? ( mirror://vmware/software/vmserver/${MY_PN}.i386.tar.gz )
amd64? ( mirror://vmware/software/vmserver/${MY_PN}.x86_64.tar.gz ) "
LICENSE="vmware"
IUSE=""
SLOT="0"
KEYWORDS="-* ~x86 ~amd64"
RESTRICT="strip"
RESTRICT="fetch strip"
CDEPEND="
>=dev-lang/perl-5
@ -36,12 +36,10 @@ DEPEND="${CDEPEND}
# vmware-server should not use virtual/libc as this is a
# precompiled binary package thats linked to glibc.
RDEPEND="${CDEPEND}
~app-emulation/vmware-modules-208.2
dev-libs/expat
dev-libs/glib
dev-libs/libxml2
=media-libs/libpng-1.2*
sys-apps/hal
sys-fs/fuse
sys-libs/zlib
virtual/pam
@ -60,7 +58,8 @@ RDEPEND="${CDEPEND}
!app-emulation/vmware-workstation
"
PDEPEND="app-emulation/vmware-vix"
PDEPEND="~app-emulation/vmware-modules-208.2
app-emulation/vmware-vix"
S=${WORKDIR}/vmware-server-distrib
@ -72,6 +71,18 @@ pkg_setup() {
fi
}
pkg_nofetch() {
if use x86; then
MY_P="${MY_PN}.i386"
elif use amd64; then
MY_P="${MY_PN}.x86_64"
fi
einfo "Please download the ${MY_P}.bundle from"
einfo "${DOWNLOAD_URL}"
einfo "and place it in ${DISTDIR}"
}
src_prepare() {
VMWARE_GROUP=${VMWARE_GROUP:-vmware}
VMWARE_INSTALL_DIR=/opt/${PN//-//}
@ -102,6 +113,7 @@ src_prepare() {
# We won't want any perl scripts from VMware once we've finally got all
# of the configuration done, but for now, they're necessary.
#rm -f *.pl bin/*.pl
rm -f vmware-install.pl bin/vmware-uninstall.pl
rm -f *.pl
rm -f etc/installer.sh
@ -151,9 +163,9 @@ src_install() {
# If we have any helper files, we install them. First, we check for an
# init script.
if [[ -e "${FILESDIR}/${PN}.rc" ]]
if [[ -e "${FILESDIR}/${PN}-2.rc" ]]
then
newinitd "${FILESDIR}"/${PN}.rc ${product} || die "newinitd"
newinitd "${FILESDIR}"/${PN}-2.rc ${product} || die "newinitd"
fi
# Then we check for an environment file.
if [[ -e "${FILESDIR}/90${PN}" ]]
@ -197,8 +209,6 @@ src_install() {
exeinto "${config_dir}"/init.d
newexe installer/services.sh ${product} || die "services.sh"
newinitd "${FILESDIR}/vmware-server-2.rc" vmware
# startup symlinks
dosym ${config_dir}/init.d/${product} ${config_dir}/init.d/vmware-autostart
dosym ${config_dir}/init.d/${product} ${config_dir}/init.d/vmware-core
@ -218,16 +228,18 @@ src_install() {
# Finally, we run the "Questions"
einfo "Adding answers to ${config_dir}/locations"
locations="${D}${config_dir}/locations"
echo "answer BINDIR ${VMWARE_INSTALL_DIR}/bin" >> ${locations}
echo "answer LIBDIR ${VMWARE_INSTALL_DIR}/lib" >> ${locations}
echo "answer MANDIR ${VMWARE_INSTALL_DIR}/man" >> ${locations}
echo "answer DOCDIR ${VMWARE_INSTALL_DIR}/doc" >> ${locations}
echo "answer SBINDIR ${VMWARE_INSTALL_DIR}/sbin" >> ${locations}
echo "answer RUN_CONFIGURATOR no" >> ${locations}
echo "answer INITDIR ${config_dir}/init.d" >> ${locations}
echo "answer INITSCRIPTSDIR ${config_dir}/init.d" >> ${locations}
echo "answer VMCI_CONFED yes" >> ${locations}
echo "answer VSOCK_CONFED yes" >> ${locations}
cat >> "${D}${config_dir}"/locations <<-EOF
answer BINDIR ${VMWARE_INSTALL_DIR}/bin
answer LIBDIR ${VMWARE_INSTALL_DIR}/lib
answer MANDIR ${VMWARE_INSTALL_DIR}/man
answer DOCDIR ${VMWARE_INSTALL_DIR}/doc
answer SBINDIR ${VMWARE_INSTALL_DIR}/sbin
answer RUN_CONFIGURATOR no
answer INITDIR ${config_dir}/init.d
answer INITSCRIPTSDIR ${config_dir}/init.d
answer VMCI_CONFED yes
answer VSOCK_CONFED yes
EOF
}
pkg_config() {
@ -235,34 +247,6 @@ pkg_config() {
"${VMWARE_INSTALL_DIR}/bin/vmware-config.pl"
}
pkg_preinst() {
# This must be done after the install to get the mtimes on each file
# right.
#Note: it's a bit weird to use ${D} in a preinst script but it should work
#(drobbins, 1 Feb 2002)
einfo "Generating ${config_dir}/locations file."
d=`echo ${D} | wc -c`
for x in `find ${D}${VMWARE_INSTALL_DIR} ${D}${config_dir}` ; do
x="`echo ${x} | cut -c ${d}-`"
if [ -d "${D}/${x}" ] ; then
echo "directory ${x}" >> "${D}${config_dir}"/locations
else
echo -n "file ${x}" >> "${D}${config_dir}"/locations
if [ "${x}" == "${config_dir}/locations" ] ; then
echo "" >> "${D}${config_dir}"/locations
elif [ "${x}" == "${config_dir}/not_configured" ] ; then
echo "" >> "${D}${config_dir}"/locations
else
echo -n " " >> "${D}${config_dir}"/locations
find "${D}${x}" -printf %T@ >> "${D}${config_dir}"/locations
echo "" >> "${D}${config_dir}"/locations
fi
fi
done
}
pkg_postinst() {
update-mime-database /usr/share/mime
[[ -d "${config_dir}" ]] && chown -R root:${VMWARE_GROUP} ${config_dir}
@ -270,13 +254,13 @@ pkg_postinst() {
# This is to fix the problem where the not_configured file doesn't get
# removed when the configuration is run. This doesn't remove the file
# It just tells the vmware-config.pl script it can delete it.
einfo "Updating ${config_dir}/locations"
for x in "${config_dir}"/._cfg????_locations ; do
if [ -f $x ] ; then
cat $x >> "${config_dir}"/locations
rm $x
fi
done
#einfo "Updating ${config_dir}/locations"
#for x in "${config_dir}"/._cfg????_locations ; do
# if [ -f $x ] ; then
# cat $x >> "${config_dir}"/locations
# rm $x
# fi
#done
ewarn "Use "
ewarn " emerge vmware-server --config"
@ -285,11 +269,6 @@ pkg_postinst() {
ewarn "In order to run ${product_name}, you have to"
ewarn "be in the '${VMWARE_GROUP}' group."
#ewarn "By default xinetd only allows connections from localhost"
#ewarn "To allow external users access to vmware-server you must edit"
#ewarn " /etc/xinetd.d/vmware-authd"
#ewarn "and specify a new 'only_from' line"
ewarn "VMWare Server also has issues when running on a JFS filesystem. For more"
ewarn "information see http://bugs.gentoo.org/show_bug.cgi?id=122500#c94"
}

View File

@ -1,35 +0,0 @@
# ChangeLog for app-emulation/vmware-view-open-client
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-view-open-client/ChangeLog,v 1.3 2009/10/21 22:51:21 tgurr Exp $
25 Dec 2009; Mario Fetka <mario.fetka@gmail.com>
-vmware-view-open-client-3.1.0_p160969.ebuild,
-vmware-view-open-client-3.1.0_p169073.ebuild,
+vmware-view-open-client-3.1.2.188088.ebuild,
-vmware-view-open-client-4.0.0_p207079.ebuild,
+vmware-view-open-client-4.0.0.201987.ebuild,
+vmware-view-open-client-4.0.0.215529.ebuild, +metadata.xml:
delete old and bump
*vmware-view-open-client-4.0.0.201987 (21 Oct 2009)
21 Oct 2009; Timo Gurr <tgurr@gentoo.org>
-vmware-view-open-client-4.0.0.196715.ebuild,
+vmware-view-open-client-4.0.0.201987.ebuild:
Version bump, remove old.
*vmware-view-open-client-4.0.0.196715 (05 Oct 2009)
*vmware-view-open-client-3.1.2.188088 (05 Oct 2009)
05 Oct 2009; Timo Gurr <tgurr@gentoo.org>
-vmware-view-open-client-3.1.0.169073.ebuild,
+vmware-view-open-client-3.1.2.188088.ebuild,
+vmware-view-open-client-4.0.0.196715.ebuild:
Version bumps, remove old.
*vmware-view-open-client-3.1.0.169073 (16 Jul 2009)
16 Jul 2009; Timo Gurr <tgurr@gentoo.org>
+vmware-view-open-client-3.1.0.169073.ebuild, +metadata.xml:
Initial ebuild, thanks to Jeremy Wood. Fixes bug #257637.

View File

@ -1,8 +0,0 @@
DIST VMware-view-open-client-source-3.1.2-188088.tar.gz 3221584 RMD160 bb5ed70271fe4456f5d76a16025e1ee26e6872a0 SHA1 84da3e2fb8affd7d95684b47465a95b40bf48906 SHA256 b2b24d487b68b07a7e11668c1e359ddc84bf948bda80fd9237bd0967ac46f2d7
DIST VMware-view-open-client-source-4.0.0-201987.tar.gz 1851269 RMD160 8e4c47e9c6a8e75a7f8e71e333a3cc590719c49c SHA1 64a19311dec0d7a1525b82420dd52232cf1f5eff SHA256 f654cd9fdcd30780def526a4006824e00b7a24476344b9f862b84c803d0c32ff
DIST VMware-view-open-client-source-4.0.0-215529.tar.gz 1887544 RMD160 d17af9356d632d850f81c7a3d7e089b96d1e2a90 SHA1 204da38c19af00e3fbc84e194f1a220ba1729d8a SHA256 aba5a9b92e60f26195eb02f582f75d4a38b626acdbdde821d48a0bb82d3455ff
EBUILD vmware-view-open-client-3.1.2.188088.ebuild 1113 RMD160 cf4756507a7eadf7adf4de290148c53051c1a216 SHA1 20c4f249d2e2331f2e454400bc2799ca5a2deda5 SHA256 cff3576d2a5ec3e407076bc996b468722a1618ff6a9d3c68950a0483b059ee86
EBUILD vmware-view-open-client-4.0.0.201987.ebuild 1113 RMD160 ee50e79cfec4b1a8e3961c3691e5975ae6f3d189 SHA1 28f1edeabdad47ceb09c571fc3401231d984bd7f SHA256 f416a65f8259c2b955148aac519a87f9e7b2819e0f951f5460c1a9b5edcbf6d7
EBUILD vmware-view-open-client-4.0.0.215529.ebuild 1113 RMD160 ee50e79cfec4b1a8e3961c3691e5975ae6f3d189 SHA1 28f1edeabdad47ceb09c571fc3401231d984bd7f SHA256 f416a65f8259c2b955148aac519a87f9e7b2819e0f951f5460c1a9b5edcbf6d7
MISC ChangeLog 1392 RMD160 0555d1dc0321cd60340529b407fa85f71089d541 SHA1 52b82a67bc6e51f4eb9ca27bb2239ca37ab23662 SHA256 49d2ba8612351175d476cf4934667ff7541a9f14e09be82fd3103f11de7b9a7a
MISC metadata.xml 379 RMD160 51dec18c38a8d65a232bf1ee6c2ef2637bd4bf48 SHA1 c61297aa532fad9a681539f95680f654377a4668 SHA256 b29387364e959c36d2a0eb125c7b77143bd88bd8c1dc283edc5c634a010b0863

View File

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>vmware</herd>
<maintainer>
<email>tgurr@gentoo.org</email>
</maintainer>
<longdescription>
VMware View Open Client lets you connect from a Linux desktop to remote
Windows desktops managed by VMware View.
</longdescription>
</pkgmetadata>

View File

@ -1,48 +0,0 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-view-open-client/vmware-view-open-client-3.1.2.188088.ebuild,v 1.1 2009/10/05 22:39:45 tgurr Exp $
EAPI="2"
inherit versionator
MY_PV=$(replace_version_separator 3 '-' )
MY_P="${PN/vm/VM}-source-${MY_PV}"
DESCRIPTION="Open Source VMware View Client"
HOMEPAGE="http://code.google.com/p/vmware-view-open-client/"
SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
COMMON_DEPEND="
>=dev-libs/boost-1.34.1
>=dev-libs/icu-3.8.0
>=dev-libs/libxml2-2.6.0
>=dev-libs/openssl-0.9.8
>=net-misc/curl-7.18.0
>=x11-libs/gtk+-2.8.0"
DEPEND="${COMMON_DEPEND}
>=dev-util/pkgconfig-0.9.0"
RDEPEND="${COMMON_DEPEND}
>=net-misc/rdesktop-1.4.1"
S="${WORKDIR}/${MY_P}"
src_configure() {
econf \
--disable-static-icu \
--disable-static-ssl \
--enable-nls \
--enable-windowed-mode \
--with-boost
}
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
}

View File

@ -1,48 +0,0 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-view-open-client/vmware-view-open-client-4.0.0.201987.ebuild,v 1.1 2009/10/21 22:51:21 tgurr Exp $
EAPI="2"
inherit versionator
MY_PV=$(replace_version_separator 3 '-' )
MY_P="${PN/vm/VM}-source-${MY_PV}"
DESCRIPTION="Open Source VMware View Client"
HOMEPAGE="http://code.google.com/p/vmware-view-open-client/"
SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
COMMON_DEPEND="
>=dev-libs/boost-1.34.1
>=dev-libs/icu-3.8.0
>=dev-libs/libxml2-2.6.0
>=dev-libs/openssl-0.9.8
>=net-misc/curl-7.18.0
>=x11-libs/gtk+-2.8.0"
DEPEND="${COMMON_DEPEND}
>=dev-util/pkgconfig-0.9.0"
RDEPEND="${COMMON_DEPEND}
>=net-misc/rdesktop-1.4.1"
S="${WORKDIR}/${MY_P}"
src_configure() {
econf \
--disable-static-icu \
--disable-static-ssl \
--enable-nls \
--enable-windowed-mode \
--with-boost
}
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
}

View File

@ -1,48 +0,0 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-view-open-client/vmware-view-open-client-4.0.0.201987.ebuild,v 1.1 2009/10/21 22:51:21 tgurr Exp $
EAPI="2"
inherit versionator
MY_PV=$(replace_version_separator 3 '-' )
MY_P="${PN/vm/VM}-source-${MY_PV}"
DESCRIPTION="Open Source VMware View Client"
HOMEPAGE="http://code.google.com/p/vmware-view-open-client/"
SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
COMMON_DEPEND="
>=dev-libs/boost-1.34.1
>=dev-libs/icu-3.8.0
>=dev-libs/libxml2-2.6.0
>=dev-libs/openssl-0.9.8
>=net-misc/curl-7.18.0
>=x11-libs/gtk+-2.8.0"
DEPEND="${COMMON_DEPEND}
>=dev-util/pkgconfig-0.9.0"
RDEPEND="${COMMON_DEPEND}
>=net-misc/rdesktop-1.4.1"
S="${WORKDIR}/${MY_P}"
src_configure() {
econf \
--disable-static-icu \
--disable-static-ssl \
--enable-nls \
--enable-windowed-mode \
--with-boost
}
src_install() {
emake DESTDIR="${D}" install || die "emake install failed"
}

View File

@ -1,26 +0,0 @@
# ChangeLog for app-emulation/vmware-vix
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-vix/ChangeLog,v 1.4 2009/08/26 14:59:25 vadimk Exp $
*vmware-vix-1.6.2.156745-r2 (26 Aug 2009)
26 Aug 2009; Vadim Kuznetsov vadimk@gentoo.org
-vmware-vix-1.6.2.156745-r1.ebuild, +vmware-vix-1.6.2.156745-r2.ebuild:
Removed unnecessary dependencies
*vmware-vix-1.6.2.156745-r1 (08 Jul 2009)
08 Jul 2009; Vadim Kuznetsov vadimk@gentoo.org
-vmware-vix-1.6.2.156745.ebuild, +vmware-vix-1.6.2.156745-r1.ebuild:
Fixing vix.libdir
06 Jul 2009; Vadim Kuznetsov vadimk@gentoo.org
vmware-vix-1.6.2.156745.ebuild:
Fix minor syntax
*vmware-vix-1.6.2.156745 (06 Jul 2009)
06 Jul 2009; Vadim Kuznetsov vadimk@gentoo.org
+vmware-vix-1.6.2.156745.ebuild, +metadata.xml:
Initial ebuild. Fixes bug 263560.

View File

@ -1,5 +0,0 @@
DIST VMware-vix-1.6.2-156745.i386.tar.gz 18413447 RMD160 36d7e4c3740e109c515de5150ec7ed969db421b1 SHA1 01ef532e329f56c6839a5be9531673623b7ddcd4 SHA256 5e230879d5c24dffda36c9b0fc69637dcdd9fffd3b306f86a5ebd9ba231a6f5b
DIST VMware-vix-1.6.2-156745.x86_64.tar.gz 22657119 RMD160 1841373c363a71645a5f8ab2b4e3790bf00d21e9 SHA1 034a7f75d58b73bc31d02c8f2503f7fdd1f1fe31 SHA256 c37b58d1cfa3686138178cc60af92c48e81ccca6f039c966ebb43928fc95adb7
EBUILD vmware-vix-1.6.2.156745-r2.ebuild 5884 RMD160 2dca3f8c81aa2c4eade2d5b55f988e8f5db13ca3 SHA1 69906ba0750d7161ebf38651b1e2428321edc4af SHA256 31fe7690bb8d49474e501160110a1120616ba9590b8804ff28344ea216a810df
MISC ChangeLog 886 RMD160 eca9e97721be28f904bd35853881f0ad896c445c SHA1 7ebbc01932d1f226c032e9ece0e949866395cd0b SHA256 78cc382725b8a0fbdfb08a03da3ef14dc6e4b87fa857f5f2defbf0dbb77f4d03
MISC metadata.xml 736 RMD160 9e0b6138a82c1ca34b847bc71bc072e44c60d95a SHA1 4365d9dc523f50c84cb02caf44fadf05ee996b3c SHA256 3882e8981caee5b279a4a1990df6b404e920ab088d6a4cd1d789cbb29e301f74

View File

@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>vmware</herd>
<maintainer>
<email>vadimk@gentoo.org</email>
</maintainer>
<longdescription>
The VIX API allows you to write programs and scripts that automate
virtual machine operations, as well as the guests within virtual
machines. This API is high-level, easy to use, and practical for both
script writers and application programmers. It runs on both Windows and
Linux and supports management of VMware Server, Workstation, and Virtual
Infrastructure (both ESX and vCenter). Bindings are provided for C,
Perl, and COM (Visual Basic, VBscript, C#).
</longdescription>
</pkgmetadata>

View File

@ -1,205 +0,0 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-vix/vmware-vix-1.6.2.156745-r2.ebuild,v 1.2 2009/08/26 17:31:46 mr_bones_ Exp $
# Unlike many other binary packages the user doesn't need to agree to a licence
# to download VMWare. The agreeing to a licence is part of the configure step
# which the user must run manually.
EAPI="2"
inherit eutils versionator
MY_PV=$(replace_version_separator 3 '-' )
MY_PN="VMware-vix-${MY_PV}"
DESCRIPTION="VMware VIX for Linux"
HOMEPAGE="http://www.vmware.com/"
SRC_URI=" x86? ( mirror://vmware/software/vmserver/${MY_PN}.i386.tar.gz )
amd64? ( mirror://vmware/software/vmserver/${MY_PN}.x86_64.tar.gz ) "
LICENSE="vmware"
IUSE=""
SLOT="0"
KEYWORDS="-* ~x86 ~amd64"
RESTRICT="strip"
# vmware-server should not use virtual/libc as this is a
# precompiled binary package thats linked to glibc.
DEPEND="
>=dev-lang/perl-5
sys-apps/pciutils
sys-apps/findutils
>=sys-libs/glibc-2.3.5
x11-misc/shared-mime-info
virtual/os-headers"
RDEPEND="${DEPEND}
dev-libs/glib
dev-libs/libxml2
dev-libs/openssl
net-misc/curl
sys-libs/zlib
!app-emulation/vmware-workstation
"
S=${WORKDIR}/vmware-vix-distrib
pkg_setup() {
if use x86; then
MY_P="${MY_PN}.i386"
elif use amd64; then
MY_P="${MY_PN}.x86_64"
fi
}
src_prepare() {
VMWARE_GROUP=${VMWARE_GROUP:-vmware}
VMWARE_INSTALL_DIR=/opt/${PN//-//}
shortname="vix"
product="vmware-vix"
config_dir="/etc/vmware-vix"
product_name="VMware VIX API"
enewgroup ${VMWARE_GROUP}
# EPATCH_SOURCE="${FILESDIR}"/${PV} EPATCH_SUFFIX="patch" epatch
sed -i -e "s:/sbin/lsmod:/bin/lsmod:" "${S}"/installer/services.sh || die "sed of services"
# We won't want any perl scripts from VMware
rm -f *.pl bin/*.pl
rm -f etc/installer.sh
}
src_install() {
# We loop through our directories and copy everything to our system.
for x in api bin lib include
do
if [[ -e "${S}/vmware-vix/${x}" ]]
then
dodir "${VMWARE_INSTALL_DIR}"/${x}
cp -pPR "${S}"/vmware-vix/${x}/* "${D}""${VMWARE_INSTALL_DIR}"/${x} \
|| die "copying ${x}"
fi
done
# If we have an /etc directory, we copy it.
#if [[ -e "${S}/etc" ]]
#then
dodir "${config_dir}"
# cp -pPR "${S}"/etc/* "${D}""${config_dir}"
# fowners root:${VMWARE_GROUP} "${config_dir}"
# fperms 770 "${config_dir}"
#fi
# If we have any helper files, we install them. First, we check for an
# init script.
if [[ -e "${FILESDIR}/${PN}.rc" ]]
then
newinitd "${FILESDIR}"/${PN}.rc ${product} || die "newinitd"
fi
local ENVD="${T}/90${PN}"
echo "PATH=${VMWARE_INSTALL_DIR}/bin" > "${ENVD}"
echo "ROOTPATH=${VMWARE_INSTALL_DIR}/bin" >> "${ENVD}"
doenvd "${ENVD}" || die "doenvd"
# Last, we check for any mime files.
if [[ -e "${FILESDIR}/${PN}.xml" ]]
then
insinto /usr/share/mime/packages
doins "${FILESDIR}"/${PN}.xml || die "mimetypes"
fi
# Blame bug #91191 for this one.
if [[ -e doc/EULA ]]
then
insinto "${VMWARE_INSTALL_DIR}"/doc
doins doc/EULA || die "copying EULA"
fi
# Now, we copy in our services.sh file
#exeinto "${config_dir}"/init.d
#newexe installer/services.sh ${product} || die "services.sh"
dohtml -r doc/VMwareVix/*
# Finally, we run the "questions"
# Questions:
einfo "Adding answers to ${config_dir}/locations"
locations="${D}${config_dir}/locations"
echo "answer BINDIR ${VMWARE_INSTALL_DIR}/bin" >> ${locations}
echo "answer VIXLIBDIR ${VMWARE_INSTALL_DIR}/lib" >> ${locations}
echo "answer LIBDIR ${VMWARE_INSTALL_DIR}/lib" >> ${locations}
#echo "answer MANDIR ${VMWARE_INSTALL_DIR}/man" >> ${locations}
echo "answer DOCDIR /usr/share/doc/${P}" >> ${locations}
local VMWARECONFIG="${T}"/config
if [[ -e ${ROOT}/etc/vmware/config ]]
then
cp -a "${ROOT}"/etc/vmware/config "${VMWARECONFIG}"
sed -i -e "/vix.libdir/d" "${VMWARECONFIG}"
fi
echo "vix.libdir = \"${VMWARE_INSTALL_DIR}/lib\"" >> "${VMWARECONFIG}"
insinto /etc/vmware/
doins "${VMWARECONFIG}"
}
pkg_preinst() {
# This must be done after the install to get the mtimes on each file
# right.
#Note: it's a bit weird to use ${D} in a preinst script but it should work
#(drobbins, 1 Feb 2002)
einfo "Generating ${config_dir}/locations file."
d=`echo ${D} | wc -c`
for x in `find ${D}${VMWARE_INSTALL_DIR} ${D}${config_dir}` ; do
x="`echo ${x} | cut -c ${d}-`"
if [ -d "${D}/${x}" ] ; then
echo "directory ${x}" >> "${D}${config_dir}"/locations
else
echo -n "file ${x}" >> "${D}${config_dir}"/locations
if [ "${x}" == "${config_dir}/locations" ] ; then
echo "" >> "${D}${config_dir}"/locations
elif [ "${x}" == "${config_dir}/not_configured" ] ; then
echo "" >> "${D}${config_dir}"/locations
else
echo -n " " >> "${D}${config_dir}"/locations
find "${D}${x}" -printf %T@ >> "${D}${config_dir}"/locations
echo "" >> "${D}${config_dir}"/locations
fi
fi
done
}
pkg_postinst() {
update-mime-database /usr/share/mime
[[ -d "${config_dir}" ]] && chown -R root:${VMWARE_GROUP} ${config_dir}
# This is to fix the problem where the not_configured file doesn't get
# removed when the configuration is run. This doesn't remove the file
# It just tells the vmware-config.pl script it can delete it.
einfo "Updating ${config_dir}/locations"
for x in "${config_dir}"/._cfg????_locations ; do
if [ -f $x ] ; then
cat $x >> "${config_dir}"/locations
rm $x
fi
done
ewarn "In order to run ${product_name}, you have to"
ewarn "be in the '${VMWARE_GROUP}' group."
}
pkg_prerm() {
sed -i -e "/vix.libdir/d" "${ROOT}"/etc/vmware/config
}
pkg_postrm() {
if ! has_version app-emulation/${PN}; then
ewarn "To remove all traces of ${producti_name} you will need to remove the files"
ewarn "in ${config_dir} and /etc/init.d/${product}."
ewarn "If the vmware-modules package is installed, you may no longer need it."
fi
}

View File

@ -1,818 +0,0 @@
# ChangeLog for app-emulation/vmware-workstation
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-workstation/ChangeLog,v 1.211 2009/09/25 10:38:14 maekke Exp $
04 Jan 2011; Mario Fetka <mario.fetka@gmail.com>
vmware-workstation-5.5.9.126128.ebuild:
correct dependency
*vmware-workstation-6.5.5.328052 (04 Jan 2011)
*vmware-workstation-6.5.4.246459 (04 Jan 2011)
04 Jan 2011; Mario Fetka <mario.fetka@gmail.com>
+files/6.5.4.246459/vmware-player.py.patch,
+files/6.5.4.246459/vmware-player-extras.py.patch,
+files/6.5.4.246459/vmware-vix.py.patch,
+files/6.5.4.246459/vmware-workstation.py.patch,
+files/6.5.5.328052/vmware-player.py.patch,
+files/6.5.5.328052/vmware-player-extras.py.patch,
vmware-workstation-5.5.9.126128.ebuild,
vmware-workstation-6.5.3.185404.ebuild,
+vmware-workstation-6.5.4.246459.ebuild,
+files/vmware-workstation-6.5.4.246459-installer.patch,
+vmware-workstation-6.5.5.328052.ebuild,
+files/vmware-workstation-6.5.5.328052-installer.patch,
+files/6.5.5.328052/vmware-vix.py.patch,
-vmware-workstation-7.0.0.203739.ebuild,
+files/6.5.5.328052/vmware-workstation.py.patch, metadata.xml:
use my modules
25 Sep 2009; Markus Meier <maekke@gentoo.org>
vmware-workstation-6.5.3.185404.ebuild:
amd64 stable, bug #282213
25 Aug 2009; Christian Faulhammer <fauli@gentoo.org>
vmware-workstation-6.5.3.185404.ebuild:
stable x86, security bug 282213
22 Aug 2009; Vadim Kuznetsov vadimk@gentoo.org
vmware-workstation-6.5.3.185404.ebuild:
Added pkg_prerm for safe unmerge
*vmware-workstation-6.5.3.185404 (22 Aug 2009)
22 Aug 2009; Vadim Kuznetsov vadimk@gentoo.org
+files/vmware-workstation-6.5.3.185404-installer.patch,
+files/6.5.3.185404/vmware-player.py.patch,
+files/6.5.3.185404/vmware-player-extras.py.patch,
+files/6.5.3.185404/vmware-vix.py.patch,
+files/6.5.3.185404/vmware-workstation.py.patch,
+vmware-workstation-6.5.3.185404.ebuild:
Version bump. Bug 282213.
30 Jul 2009; Markus Meier <maekke@gentoo.org>
vmware-workstation-6.5.2.156735.ebuild:
amd64 stable, bug #265139
06 Jul 2009; Vadim Kuznetsov vadimk@gentoo.org metadata.xml:
Updated metadata.
*vmware-workstation-6.5.2.156735-r1 (14 Jun 2009)
14 Jun 2009; Vadim Kuznetsov vadimk@gentoo.org
+vmware-workstation-6.5.2.156735-r1.ebuild, metadata.xml:
Bug 273750.
02 Jun 2009; Vadim Kuznetsov vadimk@gentoo.org Manifest:
Bug 272290. Fixing Manifest
28 May 2009; Vadim Kuznetsov vadimk@gentoo.org
vmware-workstation-6.5.2.156735.ebuild:
Bug 254836. New download url.
28 May 2009; Vadim Kuznetsov vadimk@gentoo.org
vmware-workstation-6.5.2.156735.ebuild:
Bug 271245. No more /sbin/lsmod link after module-init-tools version bump.
12 May 2009; Mike Auty <ikelos@gentoo.org>
vmware-workstation-6.5.2.156735.ebuild:
Add libgksu to RDEPEND, after it got dropped from 6.5.1 somehow. Fixes bug
258621.
05 May 2009; Christian Faulhammer <fauli@gentoo.org>
vmware-workstation-6.5.2.156735.ebuild:
stable x86, bug 265139
*vmware-workstation-6.5.2.156735 (06 Apr 2009)
06 Apr 2009; Mike Auty <ikelos@gentoo.org>
+files/6.5.2.156735/vmware-player.py.patch,
+files/6.5.2.156735/vmware-vix.py.patch,
+files/vmware-workstation-6.5.2.156735-installer.patch,
+files/6.5.2.156735/vmware-player-extras.py.patch,
+files/6.5.2.156735/vmware-workstation.py.patch,
+vmware-workstation-6.5.2.156735.ebuild:
Version bump vmware-workstation to 6.5.2.156735.
25 Mar 2009; Mike Auty <ikelos@gentoo.org>
vmware-workstation-6.5.1.126130.ebuild:
gtkmm's accessibility is now always enabled (see bug #247249)
12 Mar 2009; Diego E. Pettenò <flameeyes@gentoo.org>
vmware-workstation-6.5.1.126130.ebuild:
Remove binchecks restriction (package installs binaries!).
22 Feb 2009; Mike Auty <ikelos@gentoo.org>
-files/6.5.0.118166/vmware-player.py.patch,
-files/6.5.0.118166/vmware-workstation.py.patch,
-files/6.5.0.118166/vmware-vix.py.patch,
-files/5.5.7.91707/000_all_initd-location.patch,
-files/5.5.7.91707/001_all_fix-permissions.patch,
-files/5.5.7.91707/002_all_pagebreak-detection-fix.patch,
-files/5.5.7.91707/004_all_do-not-build-modules.patch,
-files/5.5.7.91707/007_all_use-modprobe-over-insmod.patch,
-files/5.5.7.91707/009_all_init.d-modules-warning.patch,
-files/5.5.8.108000/000_all_initd-location.patch,
-files/5.5.8.108000/001_all_fix-permissions.patch,
-files/5.5.8.108000/002_all_pagebreak-detection-fix.patch,
-files/5.5.8.108000/004_all_do-not-build-modules.patch,
-files/5.5.8.108000/007_all_use-modprobe-over-insmod.patch,
-files/5.5.8.108000/009_all_init.d-modules-warning.patch,
-files/6.0.4.93057/000_all_initd-location.patch,
-files/6.0.4.93057/001_all_fix-permissions.patch,
-files/6.0.4.93057/002_all_pagebreak-detection-fix.patch,
-files/6.0.4.93057/004_all_do-not-build-modules.patch,
-files/6.0.4.93057/007_all_use-modprobe-over-insmod.patch,
-files/6.0.4.93057/009_all_init.d-modules-warning.patch,
-files/6.0.4.93057/011_all_legit-modules-only.patch,
-files/6.0.5.109488/000_all_initd-location.patch,
-files/6.0.5.109488/001_all_fix-permissions.patch,
-files/6.0.5.109488/002_all_pagebreak-detection-fix.patch,
-files/6.0.5.109488/004_all_do-not-build-modules.patch,
-files/6.0.5.109488/007_all_use-modprobe-over-insmod.patch,
-files/6.0.5.109488/009_all_init.d-modules-warning.patch,
-files/6.0.5.109488/011_all_legit-modules-only.patch,
-files/6.5.0.118166/vmware-player-extras.py.patch,
-vmware-workstation-5.5.7.91707.ebuild,
-vmware-workstation-5.5.8.108000.ebuild,
-vmware-workstation-6.0.4.93057.ebuild,
-vmware-workstation-6.0.5.109488.ebuild,
-vmware-workstation-6.5.0.118166.ebuild:
Clear out old insecure versions of vmware-workstation (bug 245941).
14 Feb 2009; Mike Auty <ikelos@gentoo.org>
vmware-workstation-6.5.1.126130.ebuild:
Add in dependency on x11-libs/libgksu thanks to Jeff Mitchell, bug 258621.
12 Jan 2009; Markus Meier <maekke@gentoo.org>
vmware-workstation-5.5.9.126128.ebuild,
vmware-workstation-6.5.1.126130.ebuild:
amd64/x86 stable, bug #245941
11 Jan 2009; Markus Meier <maekke@gentoo.org>
vmware-workstation-5.5.8.108000.ebuild:
amd64/x86 stable, bug #236167
10 Jan 2009; Mike Auty <ikelos@gentoo.org>
vmware-workstation-6.5.1.126130.ebuild:
Fixing bug 253906.
04 Jan 2009; Ulrich Mueller <ulm@gentoo.org>
vmware-workstation-5.5.7.91707.ebuild,
vmware-workstation-5.5.8.108000.ebuild,
vmware-workstation-5.5.9.126128.ebuild,
vmware-workstation-6.0.4.93057.ebuild,
vmware-workstation-6.0.5.109488.ebuild,
vmware-workstation-6.5.0.118166.ebuild,
vmware-workstation-6.5.1.126130.ebuild:
Change virtual/xft dependency to x11-libs/libXft, bug 253771.
31 Dec 2008; Mike Auty <ikelos@gentoo.org>
vmware-workstation-6.5.0.118166.ebuild,
vmware-workstation-6.5.1.126130.ebuild:
Depend on >=libview-0.6.2, fixes bug 247138.
*vmware-workstation-6.5.1.126130 (31 Dec 2008)
31 Dec 2008; Mike Auty <ikelos@gentoo.org>
+files/6.5.1.126130/vmware-player.py.patch,
+files/6.5.1.126130/vmware-vix.py.patch,
+files/vmware-workstation-6.5.1.126130-installer.patch,
+files/6.5.1.126130/vmware-player-extras.py.patch,
+files/6.5.1.126130/vmware-workstation.py.patch,
+vmware-workstation-6.5.1.126130.ebuild:
Version bump vmware-workstation to 6.5.1.
27 Nov 2008; Mike Auty <ikelos@gentoo.org> files/helpers/vmware-config.sh:
Fix up vmware-config.sh helper (bug 246854).
17 Nov 2008; Mike Auty <ikelos@gentoo.org>
vmware-workstation-6.5.0.118166.ebuild:
Fix up missing ncurses USE dep, and clarify not-in-screen message.
11 Nov 2008; Mike Auty <ikelos@gentoo.org>
vmware-workstation-6.5.0.118166.ebuild:
Add in properties=Interactive for vmware-workstation-6.5.
10 Nov 2008; Mike Auty <ikelos@gentoo.org>
vmware-workstation-6.5.0.118166.ebuild:
Ensure it dies properly and put in a better check for screen.
*vmware-workstation-6.5.0.118166 (09 Nov 2008)
*vmware-workstation-5.5.9.126128 (09 Nov 2008)
09 Nov 2008; Mike Auty <ikelos@gentoo.org>
+files/5.5.9.126128/000_all_initd-location.patch,
+files/5.5.9.126128/002_all_pagebreak-detection-fix.patch,
+files/6.5.0.118166/vmware-player.py.patch,
+files/5.5.9.126128/001_all_fix-permissions.patch,
+files/5.5.9.126128/004_all_do-not-build-modules.patch,
+files/6.5.0.118166/vmware-player-extras.py.patch,
+files/vmware-workstation-6.5.0.118166-installer.patch,
+files/5.5.9.126128/007_all_use-modprobe-over-insmod.patch,
+files/6.5.0.118166/vmware-vix.py.patch, +files/vmware-workstation-6.5.rc,
+files/5.5.9.126128/009_all_init.d-modules-warning.patch,
+files/6.5.0.118166/vmware-workstation.py.patch,
+files/helpers/module_patcher.sh, +files/helpers/unbundler.sh,
+files/helpers/vmware-config.sh, +vmware-workstation-5.5.9.126128.ebuild,
+vmware-workstation-6.5.0.118166.ebuild:
Add in vmware-workstation 5.5.9 and introduce 6.5.0 for bug 245941.
*vmware-workstation-6.0.5.109488 (30 Sep 2008)
*vmware-workstation-5.5.8.108000 (30 Sep 2008)
30 Sep 2008; Mike Auty <ikelos@gentoo.org>
-files/4.5.3.19414/000_all_initd-location.patch,
-files/4.5.3.19414/000_all_librarypath.patch,
-files/4.5.3.19414/001_all_fix-permissions.patch,
-files/4.5.3.19414/002_all_pagebreak-detection-fix.patch,
-files/4.5.3.19414/004_all_do-not-build-modules.patch,
-files/4.5.3.19414/007_all_use-modprobe-over-insmod.patch,
-files/4.5.3.19414/009_all_init.d-modules-warning.patch,
-files/5.5.6.80404/000_all_initd-location.patch,
-files/5.5.6.80404/001_all_fix-permissions.patch,
-files/5.5.6.80404/002_all_pagebreak-detection-fix.patch,
-files/5.5.6.80404/004_all_do-not-build-modules.patch,
-files/5.5.6.80404/007_all_use-modprobe-over-insmod.patch,
-files/5.5.6.80404/009_all_init.d-modules-warning.patch,
+files/5.5.8.108000/000_all_initd-location.patch,
+files/5.5.8.108000/001_all_fix-permissions.patch,
+files/5.5.8.108000/002_all_pagebreak-detection-fix.patch,
+files/5.5.8.108000/004_all_do-not-build-modules.patch,
+files/5.5.8.108000/007_all_use-modprobe-over-insmod.patch,
+files/5.5.8.108000/009_all_init.d-modules-warning.patch,
-files/6.0.3.80004/000_all_initd-location.patch,
-files/6.0.3.80004/001_all_fix-permissions.patch,
-files/6.0.3.80004/002_all_pagebreak-detection-fix.patch,
-files/6.0.3.80004/004_all_do-not-build-modules.patch,
-files/6.0.3.80004/007_all_use-modprobe-over-insmod.patch,
-files/6.0.3.80004/009_all_init.d-modules-warning.patch,
-files/6.0.3.80004/011_all_legit-modules-only.patch,
+files/6.0.5.109488/000_all_initd-location.patch,
+files/6.0.5.109488/001_all_fix-permissions.patch,
+files/6.0.5.109488/002_all_pagebreak-detection-fix.patch,
+files/6.0.5.109488/004_all_do-not-build-modules.patch,
+files/6.0.5.109488/007_all_use-modprobe-over-insmod.patch,
+files/6.0.5.109488/009_all_init.d-modules-warning.patch,
+files/6.0.5.109488/011_all_legit-modules-only.patch,
-vmware-workstation-4.5.3.19414-r7.ebuild,
-vmware-workstation-5.5.6.80404.ebuild,
+vmware-workstation-5.5.8.108000.ebuild,
-vmware-workstation-6.0.3.80004.ebuild,
+vmware-workstation-6.0.5.109488.ebuild:
Clear out old/masked versions and bump to 5.5.8 and 6.0.5.
03 Jul 2008; Christian Faulhammer <opfer@gentoo.org>
vmware-workstation-5.5.7.91707.ebuild:
stable x86, security bug 224637
30 Jun 2008; Mike Auty <ikelos@gentoo.org>
vmware-workstation-6.0.3.80004.ebuild,
vmware-workstation-6.0.4.93057.ebuild:
Fix typo, bug 230237, thanks to Christian Schmidt for pointing it out.
22 Jun 2008; Markus Meier <maekke@gentoo.org>
vmware-workstation-5.5.7.91707.ebuild:
amd64 stable, bug #224637
*vmware-workstation-6.0.4.93057 (14 Jun 2008)
*vmware-workstation-5.5.7.91707 (14 Jun 2008)
14 Jun 2008; Mike Auty <ikelos@gentoo.org>
-files/5.5.5.56455/000_all_initd-location.patch,
-files/5.5.5.56455/001_all_fix-permissions.patch,
-files/5.5.5.56455/002_all_pagebreak-detection-fix.patch,
-files/5.5.5.56455/004_all_do-not-build-modules.patch,
-files/5.5.5.56455/007_all_use-modprobe-over-insmod.patch,
-files/5.5.5.56455/009_all_init.d-modules-warning.patch,
+files/5.5.7.91707/000_all_initd-location.patch,
+files/5.5.7.91707/001_all_fix-permissions.patch,
+files/5.5.7.91707/002_all_pagebreak-detection-fix.patch,
+files/5.5.7.91707/004_all_do-not-build-modules.patch,
+files/5.5.7.91707/007_all_use-modprobe-over-insmod.patch,
+files/5.5.7.91707/009_all_init.d-modules-warning.patch,
-files/6.0.2.59824/000_all_initd-location.patch,
-files/6.0.2.59824/001_all_fix-permissions.patch,
-files/6.0.2.59824/002_all_pagebreak-detection-fix.patch,
-files/6.0.2.59824/004_all_do-not-build-modules.patch,
-files/6.0.2.59824/007_all_use-modprobe-over-insmod.patch,
-files/6.0.2.59824/009_all_init.d-modules-warning.patch,
-files/6.0.2.59824/011_all_legit-modules-only.patch,
+files/6.0.4.93057/000_all_initd-location.patch,
+files/6.0.4.93057/001_all_fix-permissions.patch,
+files/6.0.4.93057/002_all_pagebreak-detection-fix.patch,
+files/6.0.4.93057/004_all_do-not-build-modules.patch,
+files/6.0.4.93057/007_all_use-modprobe-over-insmod.patch,
+files/6.0.4.93057/009_all_init.d-modules-warning.patch,
+files/6.0.4.93057/011_all_legit-modules-only.patch,
-vmware-workstation-5.5.5.56455.ebuild,
+vmware-workstation-5.5.7.91707.ebuild,
-vmware-workstation-6.0.2.59824.ebuild,
+vmware-workstation-6.0.4.93057.ebuild:
Version bump for bug 224637. Also clear out old version.
12 May 2008; Markus Meier <maekke@gentoo.org>
vmware-workstation-5.5.6.80404.ebuild:
amd64 stable, bug #213548
07 May 2008; Christian Faulhammer <opfer@gentoo.org>
vmware-workstation-5.5.6.80404.ebuild:
stable x86, bug 213548
26 Apr 2008; Mike Auty <ikelos@gentoo.org>
-files/6.0.1.55017/000_all_initd-location.patch,
-files/6.0.1.55017/002_all_pagebreak-detection-fix.patch,
-files/6.0.1.55017/001_all_fix-permissions.patch,
-files/6.0.1.55017/004_all_do-not-build-modules.patch,
-files/6.0.1.55017/007_all_use-modprobe-over-insmod.patch,
-files/6.0.1.55017/009_all_init.d-modules-warning.patch,
-files/6.0.1.55017/011_all_legit-modules-only.patch,
+files/vmware-player.desktop, +files/vmware-workstation.desktop,
vmware-workstation-5.5.6.80404.ebuild,
-vmware-workstation-6.0.1.55017.ebuild,
vmware-workstation-6.0.2.59824.ebuild,
vmware-workstation-6.0.3.80004.ebuild:
Fix up bugs 219076 and 123665, remove old ebuild and fix minor QA issues.
*vmware-workstation-5.5.6.80404 (04 Apr 2008)
04 Apr 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+files/5.5.6.80404/000_all_initd-location.patch,
+files/5.5.6.80404/001_all_fix-permissions.patch,
+files/5.5.6.80404/002_all_pagebreak-detection-fix.patch,
+files/5.5.6.80404/004_all_do-not-build-modules.patch,
+files/5.5.6.80404/007_all_use-modprobe-over-insmod.patch,
+files/5.5.6.80404/009_all_init.d-modules-warning.patch,
+vmware-workstation-5.5.6.80404.ebuild:
Version bump to 5.5.6.80404 for bug #213548.
*vmware-workstation-6.0.3.80004 (22 Mar 2008)
22 Mar 2008; Mike Auty <ikelos@gentoo.org>
+files/6.0.3.80004/000_all_initd-location.patch,
+files/6.0.3.80004/001_all_fix-permissions.patch,
+files/6.0.3.80004/002_all_pagebreak-detection-fix.patch,
+files/6.0.3.80004/004_all_do-not-build-modules.patch,
+files/6.0.3.80004/007_all_use-modprobe-over-insmod.patch,
+files/6.0.3.80004/009_all_init.d-modules-warning.patch,
+files/6.0.3.80004/011_all_legit-modules-only.patch,
+vmware-workstation-6.0.3.80004.ebuild:
Version bump, to fix bug 213548.
31 Jan 2008; Mike Auty <ikelos@gentoo.org> ChangeLog:
Re-sign digestless manifest.
26 Jan 2008; Mike Auty <ikelos@gentoo.org>
files/digest-vmware-workstation-4.5.3.19414-r7,
files/digest-vmware-workstation-5.5.5.56455,
files/digest-vmware-workstation-6.0.1.55017,
files/digest-vmware-workstation-6.0.2.59824, Manifest:
Redigest for any-any-update115.
*vmware-workstation-6.0.2.59824 (25 Nov 2007)
25 Nov 2007; Mike Auty <ikelos@gentoo.org>
+files/6.0.2.59824/000_all_initd-location.patch,
+files/6.0.2.59824/001_all_fix-permissions.patch,
+files/6.0.2.59824/002_all_pagebreak-detection-fix.patch,
+files/6.0.2.59824/004_all_do-not-build-modules.patch,
+files/6.0.2.59824/007_all_use-modprobe-over-insmod.patch,
+files/6.0.2.59824/009_all_init.d-modules-warning.patch,
+files/6.0.2.59824/011_all_legit-modules-only.patch,
files/vmware-workstation.rc, +vmware-workstation-6.0.2.59824.ebuild:
Version bump to 6.0.2.
07 Nov 2007; Chris Gianelloni <wolf31o2@gentoo.org>
-files/5.5.4.44386/000_all_initd-location.patch,
-files/5.5.4.44386/002_all_pagebreak-detection-fix.patch,
-files/6.0.0.45731/000_all_initd-location.patch,
-files/5.5.4.44386/001_all_fix-permissions.patch,
-files/5.5.4.44386/004_all_do-not-build-modules.patch,
-files/5.5.4.44386/007_all_use-modprobe-over-insmod.patch,
-files/5.5.4.44386/009_all_init.d-modules-warning.patch,
-files/6.0.0.45731/001_all_fix-permissions.patch,
-files/6.0.0.45731/002_all_pagebreak-detection-fix.patch,
-files/6.0.0.45731/004_all_do-not-build-modules.patch,
-files/6.0.0.45731/007_all_use-modprobe-over-insmod.patch,
-files/6.0.0.45731/009_all_init.d-modules-warning.patch,
-vmware-workstation-5.5.4.44386.ebuild,
-vmware-workstation-6.0.0.45731.ebuild:
Cleaning up older ebuilds.
*vmware-workstation-6.0.1.55017 (14 Oct 2007)
14 Oct 2007; Mike Auty <ikelos@gentoo.org>
+files/6.0.1.55017/000_all_initd-location.patch,
+files/6.0.1.55017/001_all_fix-permissions.patch,
+files/6.0.1.55017/002_all_pagebreak-detection-fix.patch,
+files/6.0.1.55017/004_all_do-not-build-modules.patch,
+files/6.0.1.55017/007_all_use-modprobe-over-insmod.patch,
+files/6.0.1.55017/009_all_init.d-modules-warning.patch,
+files/6.0.1.55017/011_all_legit-modules-only.patch,
+vmware-workstation-6.0.1.55017.ebuild:
Version bump, fixes some security bugs
11 Oct 2007; Mike Doty <kingtaco@gentoo.org>
vmware-workstation-5.5.5.56455.ebuild:
amd64 stable, bug 193196
23 Sep 2007; Christian Faulhammer <opfer@gentoo.org>
vmware-workstation-5.5.5.56455.ebuild:
stable x86, security bug 193196
*vmware-workstation-5.5.5.56455 (21 Sep 2007)
21 Sep 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+files/5.5.5.56455/000_all_initd-location.patch,
+files/5.5.5.56455/001_all_fix-permissions.patch,
+files/5.5.5.56455/002_all_pagebreak-detection-fix.patch,
+files/5.5.5.56455/004_all_do-not-build-modules.patch,
+files/5.5.5.56455/007_all_use-modprobe-over-insmod.patch,
+files/5.5.5.56455/009_all_init.d-modules-warning.patch,
+vmware-workstation-5.5.5.56455.ebuild:
Version bump for bug #193196.
16 Sep 2007; Mike Auty <ikelos@gentoo.org> files/vmware-workstation.rc:
Alter init script to interoperate with baselayout-2 and unusual shells such
as dash.
31 Jul 2007; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-workstation-6.0.0.45731.ebuild:
Typo fix.
28 Jul 2007; Mike Auty <ikelos@gentoo.org>
vmware-workstation-6.0.0.45731.ebuild:
Redigest for vmware-any-any-update112 and fix fetch restriction problems.
13 Jul 2007; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-workstation-4.5.3.19414-r7.ebuild,
vmware-workstation-5.5.4.44386.ebuild,
vmware-workstation-6.0.0.45731.ebuild:
Added another mirror for the vmware-any-any-update patchset.
13 Jul 2007; Chris Gianelloni <wolf31o2@gentoo.org>
-files/5.5.3.34685/000_all_initd-location.patch,
-files/5.5.3.34685/001_all_fix-permissions.patch,
-files/5.5.3.34685/002_all_pagebreak-detection-fix.patch,
-files/5.5.3.34685/004_all_do-not-build-modules.patch,
-files/5.5.3.34685/007_all_use-modprobe-over-insmod.patch,
-files/5.5.3.34685/009_all_init.d-modules-warning.patch,
-vmware-workstation-5.5.3.34685.ebuild:
Removing older versions which are no longer needed.
*vmware-workstation-6.0.0.45731 (24 Jun 2007)
24 Jun 2007; Mike Auty <ikelos@gentoo.org>
-files/5.5.1.19175/000_all_initd-location.patch,
-files/5.5.1.19175/001_all_fix-permissions.patch,
-files/5.5.1.19175/002_all_pagebreak-detection-fix.patch,
-files/5.5.1.19175/004_all_do-not-build-modules.patch,
-files/5.5.1.19175/007_all_use-modprobe-over-insmod.patch,
-files/5.5.1.19175/009_all_init.d-modules-warning.patch,
-files/5.5.2.29772/000_all_initd-location.patch,
-files/5.5.2.29772/001_all_fix-permissions.patch,
-files/5.5.2.29772/002_all_pagebreak-detection-fix.patch,
-files/5.5.2.29772/004_all_do-not-build-modules.patch,
-files/5.5.2.29772/007_all_use-modprobe-over-insmod.patch,
-files/5.5.2.29772/009_all_init.d-modules-warning.patch,
+files/6.0.0.45731/000_all_initd-location.patch,
+files/6.0.0.45731/001_all_fix-permissions.patch,
+files/6.0.0.45731/002_all_pagebreak-detection-fix.patch,
+files/6.0.0.45731/004_all_do-not-build-modules.patch,
+files/6.0.0.45731/007_all_use-modprobe-over-insmod.patch,
+files/6.0.0.45731/009_all_init.d-modules-warning.patch,
+vmware-workstation-6.0.0.45731.ebuild:
Version bump, the new version features a native 64-bit version, USB 2.0 and
some speed improvements too.
*vmware-workstation-5.5.4.44386 (15 May 2007)
15 May 2007; Chris Gianelloni <wolf31o2@gentoo.org>
+files/5.5.4.44386/000_all_initd-location.patch,
+files/5.5.4.44386/001_all_fix-permissions.patch,
+files/5.5.4.44386/002_all_pagebreak-detection-fix.patch,
+files/5.5.4.44386/004_all_do-not-build-modules.patch,
+files/5.5.4.44386/007_all_use-modprobe-over-insmod.patch,
+files/5.5.4.44386/009_all_init.d-modules-warning.patch,
+vmware-workstation-5.5.4.44386.ebuild:
Version bump to 5.5.4 for bug #176678 and bug #176647.
28 Apr 2007; Mike Auty <ikelos@gentoo.org> files/vmware-workstation.rc:
Redigest for vmware-any-any109, and fix rc file for baselayout-2.
23 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org>
files/vmware-workstation.rc:
Added use hald to the VMware Workstation init script thanks to bug #155450.
20 Apr 2007; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-workstation-5.5.3.34685.ebuild:
Added some ewarn about hald fro bug #155450.
07 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org>
files/vmware-workstation.rc:
Change all instances of [ to [[.
05 Mar 2007; Mike Auty <ikelos@gentoo.org>
files/digest-vmware-workstation-4.5.3.19414-r7,
files/digest-vmware-workstation-5.5.3.34685, Manifest:
Bump vmware-any-any to 108.
07 Feb 2007; Mike Auty <ikelos@gentoo.org>
files/digest-vmware-workstation-5.5.3.34685, Manifest:
Fix broken digest.
05 Feb 2007; Mike Auty <ikelos@gentoo.org>
files/digest-vmware-workstation-4.5.3.19414-r7,
files/digest-vmware-workstation-5.5.3.34685, Manifest:
Vmware-any-any bump.
14 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-workstation-4.5.3.19414-r7.ebuild,
vmware-workstation-5.5.3.34685.ebuild:
Fixed typo for bug #158134.
04 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-workstation-4.5.3.19414-r7.ebuild,
vmware-workstation-5.5.3.34685.ebuild:
Removed RESTRICT=stricter since it has been removed from portage. This is
for bug #131633. If you have any problems with this, please reply to that
bug report.
01 Dec 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-vmware-workstation-5.5.1.19175-r7.ebuild,
-vmware-workstation-5.5.2.29772.ebuild,
vmware-workstation-5.5.3.34685.ebuild:
Updated digest/Manifest for vmware-any-any-update105, marked 5.5.3 stable on
amd64/x86, and removing older 5.5 ebuilds.
*vmware-workstation-5.5.3.34685 (20 Nov 2006)
20 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+files/5.5.3.34685/000_all_initd-location.patch,
+files/5.5.3.34685/001_all_fix-permissions.patch,
+files/5.5.3.34685/002_all_pagebreak-detection-fix.patch,
+files/5.5.3.34685/004_all_do-not-build-modules.patch,
+files/5.5.3.34685/007_all_use-modprobe-over-insmod.patch,
+files/5.5.3.34685/009_all_init.d-modules-warning.patch,
+vmware-workstation-5.5.3.34685.ebuild:
Added 5.5.3 version and closing bug #155593. Remember, kids, every time you
file a 0-day bump request, God kills a kitten. Please think of the kittens.
16 Nov 2006; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-workstation-5.5.2.29772.ebuild:
Added another mirror for VMware Workstation 5.5.2, so it can be fetched
properly.
30 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-vmware-workstation-4.5.3.19414-r4.ebuild,
-vmware-workstation-4.5.3.19414-r6.ebuild,
-vmware-workstation-5.5.1.19175-r4.ebuild,
-vmware-workstation-5.5.1.19175-r6.ebuild:
Cleaning up some older ebuilds.
30 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-files/3.2.1.2242/vmware-glibc-2.3.2-compat.c,
-files/3.2.1.2242/90vmware-workstation, -files/3.2.1.2242/vmware,
-files/3.2.1.2242/vmware-config.pl-gcc-generalized.patch,
-vmware-workstation-3.2.1.2242-r12.ebuild:
Removing VMware 3.2.1 as it is unmaintainable due to my being unable to test
fixes on it and upstream has abandoned support for it, so new patches are no
longer made for this product.
24 Oct 2006; Simon Stelling <blubb@gentoo.org>
vmware-workstation-4.5.3.19414-r7.ebuild,
vmware-workstation-5.5.1.19175-r7.ebuild:
stable on amd64 wrt bug 148682
20 Oct 2006; Joshua Jackson <tsunam@gentoo.org>
vmware-workstation-4.5.3.19414-r7.ebuild,
vmware-workstation-5.5.1.19175-r7.ebuild:
Stable x86; bug #148682
*vmware-workstation-5.5.1.19175-r7 (03 Oct 2006)
*vmware-workstation-4.5.3.19414-r7 (03 Oct 2006)
03 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+vmware-workstation-4.5.3.19414-r7.ebuild,
+vmware-workstation-5.5.1.19175-r7.ebuild,
vmware-workstation-5.5.2.29772.ebuild:
New revision ebuilds to hopefully finally fix bug #148682.
*vmware-workstation-5.5.1.19175-r6 (02 Oct 2006)
*vmware-workstation-4.5.3.19414-r6 (02 Oct 2006)
02 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-vmware-workstation-4.5.3.19414-r5.ebuild,
+vmware-workstation-4.5.3.19414-r6.ebuild,
-vmware-workstation-5.5.1.19175-r5.ebuild,
+vmware-workstation-5.5.1.19175-r6.ebuild,
vmware-workstation-5.5.2.29772.ebuild:
Alright, we are revision-bumping again so that we pull in my pre-compiled
libssl.so.0.9.7 for bug #148862.
02 Oct 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-vmware-workstation-3.2.1.2242-r11.ebuild,
vmware-workstation-3.2.1.2242-r12.ebuild:
Marking 3.2.1.2242-r12 stable on x86 because it gives identical output to -r11.
29 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+files/4.5.3.19414/000_all_initd-location.patch,
+files/4.5.3.19414/001_all_fix-permissions.patch,
+files/4.5.3.19414/004_all_do-not-build-modules.patch,
+files/4.5.3.19414/007_all_use-modprobe-over-insmod.patch:
Added some more patches from 5.5 to hopefully resolve bug #122322.
*vmware-workstation-5.5.2.29772 (28 Sep 2006)
28 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+files/5.5.2.29772/000_all_initd-location.patch,
+files/5.5.2.29772/001_all_fix-permissions.patch,
+files/5.5.2.29772/002_all_pagebreak-detection-fix.patch,
+files/5.5.2.29772/004_all_do-not-build-modules.patch,
+files/5.5.2.29772/007_all_use-modprobe-over-insmod.patch,
+files/5.5.2.29772/009_all_init.d-modules-warning.patch,
+vmware-workstation-5.5.2.29772.ebuild:
Version bump to 5.5.2, which I am leaving masked for the time being because
I hate the idea of forcing more than 100MB on people that they don't need. I
will unmask this once I come up with a better solution.
28 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-workstation-3.2.1.2242-r11.ebuild,
vmware-workstation-3.2.1.2242-r12.ebuild,
vmware-workstation-4.5.3.19414-r4.ebuild,
vmware-workstation-4.5.3.19414-r5.ebuild,
vmware-workstation-5.5.1.19175-r4.ebuild,
vmware-workstation-5.5.1.19175-r5.ebuild:
TEXTREL->TEXTRELS and added stricter to RESTRICT. Closing bug #143100.
28 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-workstation-3.2.1.2242-r11.ebuild,
vmware-workstation-3.2.1.2242-r12.ebuild,
vmware-workstation-4.5.3.19414-r4.ebuild,
vmware-workstation-4.5.3.19414-r5.ebuild,
vmware-workstation-5.5.1.19175-r4.ebuild,
vmware-workstation-5.5.1.19175-r5.ebuild:
Changed VMWare to VMware.
*vmware-workstation-5.5.1.19175-r5 (27 Sep 2006)
*vmware-workstation-4.5.3.19414-r5 (27 Sep 2006)
*vmware-workstation-3.2.1.2242-r12 (27 Sep 2006)
27 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-workstation-3.2.1.2242-r11.ebuild,
+vmware-workstation-3.2.1.2242-r12.ebuild,
vmware-workstation-4.5.3.19414-r4.ebuild,
+vmware-workstation-4.5.3.19414-r5.ebuild,
vmware-workstation-5.5.1.19175-r4.ebuild,
+vmware-workstation-5.5.1.19175-r5.ebuild:
Revision bump to force an upgrade due to bug #148682.
15 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-workstation-3.2.1.2242-r11.ebuild,
vmware-workstation-4.5.3.19414-r4.ebuild,
vmware-workstation-5.5.1.19175-r4.ebuild:
Added a bunch of QA variable information for bug #143100.
10 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-workstation-5.5.1.19175-r4.ebuild:
Alright, uncomment the creation of our own VMware desktop entry, change it
to use type=System, and add an entry for VMware Player. This makes the icons
the same as what is provided by upstream.
09 Sep 2006; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-workstation-5.5.1.19175-r4.ebuild:
Remove the desktop entry that we're creating in favor the the
VMware-supplied versions.
25 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org>
files/digest-vmware-workstation-3.2.1.2242-r11,
files/digest-vmware-workstation-4.5.3.19414-r4,
files/digest-vmware-workstation-5.5.1.19175-r4, Manifest:
Redigested for vmware-any-any-update104.
25 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-files/vmware-workstation-4.5.3.19414-librarypath.patch,
-files/vmware-workstation-5.5.1.19175-config.patch,
-files/vmware-workstation-5.5.1.19175-config2.patch,
-files/vmware-workstation-5.5.1.19175-config3.patch, -files/vmware.rc,
-files/vmware.xml, -vmware-workstation-3.2.1.2242-r10.ebuild,
vmware-workstation-3.2.1.2242-r11.ebuild,
-vmware-workstation-4.5.3.19414-r3.ebuild,
vmware-workstation-4.5.3.19414-r4.ebuild,
-vmware-workstation-5.5.1.19175-r3.ebuild,
vmware-workstation-5.5.1.19175-r4.ebuild:
Stable on amd64/x86 and removing older ebuilds.
09 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-workstation-4.5.3.19414-r4.ebuild,
vmware-workstation-5.5.1.19175-r4.ebuild:
Fix icons to point to the right place. Blame Paul Varner
<fuzzyray@gentoo.org> on bug #123655.
09 Aug 2006; Mike Auty <ikelos@gentoo.org>
vmware-workstation-3.2.1.2242-r10.ebuild,
vmware-workstation-3.2.1.2242-r11.ebuild,
vmware-workstation-4.5.3.19414-r3.ebuild,
vmware-workstation-4.5.3.19414-r4.ebuild,
vmware-workstation-5.5.1.19175-r3.ebuild,
vmware-workstation-5.5.1.19175-r4.ebuild:
-m Alter ebuild so that the metadata cache is invalidated.
08 Aug 2006; Mike Auty <ikelos@gentoo.org>
files/digest-vmware-workstation-3.2.1.2242-r11,
files/digest-vmware-workstation-4.5.3.19414-r4,
files/digest-vmware-workstation-5.5.1.19175-r4, Manifest:
New digests to work with vmware-any-any103, which fixes some problems with
the 2.6.18 kernel.
04 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-workstation-3.2.1.2242-r11.ebuild,
vmware-workstation-4.5.3.19414-r4.ebuild,
vmware-workstation-5.5.1.19175-r4.ebuild:
Fix up the icon creation for each of the new revisions.
*vmware-workstation-5.5.1.19175-r4 (04 Aug 2006)
*vmware-workstation-4.5.3.19414-r4 (04 Aug 2006)
*vmware-workstation-3.2.1.2242-r11 (04 Aug 2006)
04 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+files/4.5.3.19414/000_all_librarypath.patch,
+files/5.5.1.19175/000_all_initd-location.patch,
+files/4.5.3.19414/002_all_pagebreak-detection-fix.patch,
+files/5.5.1.19175/001_all_fix-permissions.patch,
+files/4.5.3.19414/009_all_init.d-modules-warning.patch,
+files/5.5.1.19175/002_all_pagebreak-detection-fix.patch,
+files/5.5.1.19175/004_all_do-not-build-modules.patch,
+files/5.5.1.19175/007_all_use-modprobe-over-insmod.patch,
+files/5.5.1.19175/009_all_init.d-modules-warning.patch,
+files/vmware-workstation.rc, +files/vmware-workstation.xml,
+vmware-workstation-3.2.1.2242-r11.ebuild,
+vmware-workstation-4.5.3.19414-r4.ebuild,
+vmware-workstation-5.5.1.19175-r4.ebuild:
Moved vmware-workstation ebuilds using the new vmware eclass from the vmware
overlay to the tree.
27 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-workstation-3.2.1.2242-r10.ebuild,
vmware-workstation-4.5.3.19414-r3.ebuild,
vmware-workstation-5.5.1.19175-r3.ebuild:
Changed to use mirror://vmware instead of the individual sites.
17 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-vmware-workstation-3.2.1.2242-r7.ebuild,
-vmware-workstation-4.5.3.19414.ebuild,
-vmware-workstation-5.5.1.19175.ebuild:
Removing older ebuilds.
17 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-workstation-3.2.1.2242-r10.ebuild,
vmware-workstation-4.5.3.19414-r3.ebuild,
vmware-workstation-5.5.1.19175-r3.ebuild:
Marking stable on amd64/x86 (where applicable) to force users to upgrade to
the new update101 patch, which fixes compilation on several kernels.
*vmware-workstation-5.5.1.19175-r3 (17 Apr 2006)
*vmware-workstation-4.5.3.19414-r3 (17 Apr 2006)
*vmware-workstation-3.2.1.2242-r10 (17 Apr 2006)
17 Apr 2006; Chris Gianelloni <wolf31o2@gentoo.org>
-vmware-workstation-3.2.1.2242-r9.ebuild,
+vmware-workstation-3.2.1.2242-r10.ebuild,
-vmware-workstation-4.5.3.19414-r2.ebuild,
+vmware-workstation-4.5.3.19414-r3.ebuild,
-vmware-workstation-5.5.1.19175-r2.ebuild,
+vmware-workstation-5.5.1.19175-r3.ebuild:
Revision bump to bring in update101.
31 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-workstation-5.5.1.19175-r2.ebuild:
It helps if I actually add the patch to the ebuild. Closing bug #127023 and
bug #127661.
*vmware-workstation-5.5.1.19175-r2 (31 Mar 2006)
*vmware-workstation-4.5.3.19414-r2 (31 Mar 2006)
*vmware-workstation-3.2.1.2242-r9 (31 Mar 2006)
31 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+files/vmware-workstation-5.5.1.19175-config3.patch,
-vmware-workstation-3.2.1.2242-r8.ebuild,
+vmware-workstation-3.2.1.2242-r9.ebuild,
-vmware-workstation-4.5.3.19414-r1.ebuild,
+vmware-workstation-4.5.3.19414-r2.ebuild,
-vmware-workstation-5.5.1.19175-r1.ebuild,
+vmware-workstation-5.5.1.19175-r2.ebuild:
Added patch for vmware-config.pl to allow for 2G/2G from 2.6.16 and closing
bug #127661 and bug #127023.
*vmware-workstation-5.5.1.19175-r1 (20 Mar 2006)
*vmware-workstation-4.5.3.19414-r1 (20 Mar 2006)
*vmware-workstation-3.2.1.2242-r8 (20 Mar 2006)
20 Mar 2006; Chris Gianelloni <wolf31o2@gentoo.org>
vmware-workstation-3.2.1.2242-r7.ebuild,
+vmware-workstation-3.2.1.2242-r8.ebuild,
+vmware-workstation-4.5.3.19414-r1.ebuild,
+vmware-workstation-5.5.1.19175-r1.ebuild:
Added a new revision with vmware-any-any-update98 that should also resolve
bug #117696.

View File

@ -1,49 +0,0 @@
AUX 5.5.9.126128/000_all_initd-location.patch 1131 RMD160 3ab69d825994cc3bb177143d27091fc292cec46a SHA1 14264460c8500f1ead267059e2b9b9a5dc8c057f SHA256 b4055370b0092e71a2b2b0f27edeb7bc063ad265f95ab4530e52c3ab3167ad62
AUX 5.5.9.126128/001_all_fix-permissions.patch 647 RMD160 0f25f7dd60dfcb5a72b1f7b9cf344d6f431143a9 SHA1 cabd3dd071ef62d4c70f52d1a3e02334ec7f3a73 SHA256 41492cde60da6d449c0f427ac7bd65598838ec17ac0e3a5f545feeb1d29ea391
AUX 5.5.9.126128/002_all_pagebreak-detection-fix.patch 800 RMD160 f21a51e552d025a5120519d6dcd41efc3835a432 SHA1 06133c332b6b1f57476b1154de108a9dfc35435d SHA256 d327d7cb2166b9ef4c8c286568c3a7eb64542212164d58b8a7a3c5e51e19ed6d
AUX 5.5.9.126128/004_all_do-not-build-modules.patch 589 RMD160 b2153579c65a232de9c2e6dbd9bbe108d85f95e5 SHA1 394a67a30f1f29084836183303641915ce982bfd SHA256 916754b0616ea330490b9572be1a9216bb7dd441ba328b1e01e777b29fac4e1e
AUX 5.5.9.126128/007_all_use-modprobe-over-insmod.patch 445 RMD160 186ab443a733276a702dea16a23c04f7deed9d13 SHA1 c7113cd3f7f91527397f6fb07797d4e9c5c6f011 SHA256 bcf4930fae4812c8fbb2eb58b200f1da9441d97cd0c74b8ee6250cf097a28630
AUX 5.5.9.126128/009_all_init.d-modules-warning.patch 991 RMD160 6205e976db47cd3361b5eca8593414d411a2ab8d SHA1 3742749baa606a57d447931f0af791696a49e660 SHA256 5fbc9f101abb3816a732f64a75e90ce7fcb6783c3cd7bae521d8785e88634498
AUX 6.5.3.185404/vmware-player-extras.py.patch 426 RMD160 458d95094d2e47726221ab427486b263b87e4297 SHA1 e41c36cfe150380aceafd1768e9e159fb4e1813f SHA256 1047cdc79d4bc138deaf809f191bdde69c4a5a8ed6ab5b595457a341ecb68abb
AUX 6.5.3.185404/vmware-player.py.patch 2936 RMD160 6b9957799b3571f5382975c4d78bc3db7d16e666 SHA1 b32f9e4c2d2213872a7d8f88754a8552b113567f SHA256 fa711634a038d313769cf5d5180ca96bfb3ba18f392f6c0dd0672a4b4f7d6c9c
AUX 6.5.3.185404/vmware-vix.py.patch 439 RMD160 88e318b81efa5340830f1d9a65112ce2d23d0335 SHA1 ca84dacd405f675f31f2da5bea7cdf5d7d988739 SHA256 ad41ae4a4a580fa3b6f7ebd1d04d6e7885c3fb5695d5675ed168ce29925dbded
AUX 6.5.3.185404/vmware-workstation.py.patch 948 RMD160 5ee87ba02c4bb50af44eb495ab72e1f148ff84ae SHA1 33b32bdbba9ec6115ea5d44080682ed789a7766b SHA256 4e9a01f8072a1294c0d5631daee703ea183e5a8edb6400f49deddd2b96bb2dc2
AUX 6.5.4.246459/vmware-player-extras.py.patch 426 RMD160 458d95094d2e47726221ab427486b263b87e4297 SHA1 e41c36cfe150380aceafd1768e9e159fb4e1813f SHA256 1047cdc79d4bc138deaf809f191bdde69c4a5a8ed6ab5b595457a341ecb68abb
AUX 6.5.4.246459/vmware-player.py.patch 2936 RMD160 6b9957799b3571f5382975c4d78bc3db7d16e666 SHA1 b32f9e4c2d2213872a7d8f88754a8552b113567f SHA256 fa711634a038d313769cf5d5180ca96bfb3ba18f392f6c0dd0672a4b4f7d6c9c
AUX 6.5.4.246459/vmware-vix.py.patch 439 RMD160 88e318b81efa5340830f1d9a65112ce2d23d0335 SHA1 ca84dacd405f675f31f2da5bea7cdf5d7d988739 SHA256 ad41ae4a4a580fa3b6f7ebd1d04d6e7885c3fb5695d5675ed168ce29925dbded
AUX 6.5.4.246459/vmware-workstation.py.patch 948 RMD160 5ee87ba02c4bb50af44eb495ab72e1f148ff84ae SHA1 33b32bdbba9ec6115ea5d44080682ed789a7766b SHA256 4e9a01f8072a1294c0d5631daee703ea183e5a8edb6400f49deddd2b96bb2dc2
AUX 6.5.5.328052/vmware-player-extras.py.patch 426 RMD160 458d95094d2e47726221ab427486b263b87e4297 SHA1 e41c36cfe150380aceafd1768e9e159fb4e1813f SHA256 1047cdc79d4bc138deaf809f191bdde69c4a5a8ed6ab5b595457a341ecb68abb
AUX 6.5.5.328052/vmware-player.py.patch 2936 RMD160 6b9957799b3571f5382975c4d78bc3db7d16e666 SHA1 b32f9e4c2d2213872a7d8f88754a8552b113567f SHA256 fa711634a038d313769cf5d5180ca96bfb3ba18f392f6c0dd0672a4b4f7d6c9c
AUX 6.5.5.328052/vmware-vix.py.patch 439 RMD160 88e318b81efa5340830f1d9a65112ce2d23d0335 SHA1 ca84dacd405f675f31f2da5bea7cdf5d7d988739 SHA256 ad41ae4a4a580fa3b6f7ebd1d04d6e7885c3fb5695d5675ed168ce29925dbded
AUX 6.5.5.328052/vmware-workstation.py.patch 948 RMD160 5ee87ba02c4bb50af44eb495ab72e1f148ff84ae SHA1 33b32bdbba9ec6115ea5d44080682ed789a7766b SHA256 4e9a01f8072a1294c0d5631daee703ea183e5a8edb6400f49deddd2b96bb2dc2
AUX 7.0.0.203739/vmware-player-extras.py.patch 426 RMD160 458d95094d2e47726221ab427486b263b87e4297 SHA1 e41c36cfe150380aceafd1768e9e159fb4e1813f SHA256 1047cdc79d4bc138deaf809f191bdde69c4a5a8ed6ab5b595457a341ecb68abb
AUX 7.0.0.203739/vmware-player.py.patch 2936 RMD160 6b9957799b3571f5382975c4d78bc3db7d16e666 SHA1 b32f9e4c2d2213872a7d8f88754a8552b113567f SHA256 fa711634a038d313769cf5d5180ca96bfb3ba18f392f6c0dd0672a4b4f7d6c9c
AUX 7.0.0.203739/vmware-vix.py.patch 439 RMD160 88e318b81efa5340830f1d9a65112ce2d23d0335 SHA1 ca84dacd405f675f31f2da5bea7cdf5d7d988739 SHA256 ad41ae4a4a580fa3b6f7ebd1d04d6e7885c3fb5695d5675ed168ce29925dbded
AUX 7.0.0.203739/vmware-workstation.py.patch 948 RMD160 5ee87ba02c4bb50af44eb495ab72e1f148ff84ae SHA1 33b32bdbba9ec6115ea5d44080682ed789a7766b SHA256 4e9a01f8072a1294c0d5631daee703ea183e5a8edb6400f49deddd2b96bb2dc2
AUX 90vmware-workstation 106 RMD160 471fb03d54bb48c651d4543f1c8ece1bb9b40c0a SHA1 3db7ec2a3b37a84328bf3d481a58b42499ef520b SHA256 c8f7143551f516b901143e60fc74e822ca3d235477d1c2a135bb36cbc639cf1e
AUX helpers/module_patcher.sh 174 RMD160 0b2d1ee14443ec188546b090ae2c5e6efd132026 SHA1 f00ea5d03430be4969834bda822ed2865ef6e079 SHA256 1e63240f7e21e119c8e0b083f540fdde83fc22d781f3abe43927713a464898ea
AUX helpers/unbundler.sh 1828 RMD160 d5bb43628d105c4372fa1fe7e7ebac29300fa91f SHA1 ed4b2645369b63e1cb6e322d412eb2ede1cbbdcd SHA256 4e71dd96f5136c1eb98be5e1184b9ec48ed9ac7935fa1defd94d501cef05eb78
AUX helpers/vmware-config.sh 497 RMD160 04addab6d99bf2c984f855a97b935ca8e0e584d8 SHA1 935eb3f565cebdca806d20e852a4bc75c7bc420b SHA256 72712959b26b22bfe8118561cd7b0751973d2a9dd8c2b15379cd42dc8a4ac246
AUX vmware-player.desktop 599 RMD160 a5a9897671da69c4706ba412d9a041edfd13a9b7 SHA1 12af70f7039b19838e298d1949df28b1b8d407a6 SHA256 b967f2e6dba531613498a2dea130f557fc366e869876aa63ba3ae97f5ff59c54
AUX vmware-workstation-6.5.3.185404-installer.patch 2919 RMD160 7921285177ee1238501a95bbab78d100a307674d SHA1 df430803a06ef073a9725b2c86e210c3cc62ceed SHA256 ef63e8d642ae77bf10f22a586c4c37e5c387f76084d71350a9af418d1c5a2858
AUX vmware-workstation-6.5.4.246459-installer.patch 2919 RMD160 7921285177ee1238501a95bbab78d100a307674d SHA1 df430803a06ef073a9725b2c86e210c3cc62ceed SHA256 ef63e8d642ae77bf10f22a586c4c37e5c387f76084d71350a9af418d1c5a2858
AUX vmware-workstation-6.5.5.328052-installer.patch 2919 RMD160 7921285177ee1238501a95bbab78d100a307674d SHA1 df430803a06ef073a9725b2c86e210c3cc62ceed SHA256 ef63e8d642ae77bf10f22a586c4c37e5c387f76084d71350a9af418d1c5a2858
AUX vmware-workstation-6.5.rc 1444 RMD160 8d3cb79bdcb48fb944615279e741146c36792bc2 SHA1 bd2784708b998c894dfdf661295b3e1708ce47fa SHA256 4636d8dbcb4f263d49769f7fb7c7f8945355f0bb2e858f4fd4aa96dff87d3dd1
AUX vmware-workstation-7.0.0.203739-installer.patch 2967 RMD160 be8dbd5ef86df784c1e8d7c3cd8267cd48b3c849 SHA1 6d400351f435cc31f0ff1dd019868813ea388337 SHA256 3f4cfaa9785a8acfbf8bd7db3401d08360c65e0e08e5a49d55138eab40de1bf6
AUX vmware-workstation.desktop 605 RMD160 256b59a1e52b65279ef38b3dcf52c43a34090807 SHA1 8f8c1fded85070be0532e33f1bdc05425e33bfb1 SHA256 ae2f572200a16a1e1222e282268ae138588c0e7576045a584c1d17f54f379f3e
AUX vmware-workstation.rc 1862 RMD160 000c71ee5c62edc27d3df3f23286e1fe8490516e SHA1 cf1db60598d0d2fe44260f7387537ec1babf3a52 SHA256 76e6ea8c199a4dced79a75a0346360714941ef192b61e4610c6229e071d64782
AUX vmware-workstation.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d
DIST VMware-Workstation-6.5.3-185404.i386.bundle 411839182 RMD160 c7ff79655b286f133ca2bcb9b172828be8982ed9 SHA1 c0c6f9b56e70bd3ffdb5467ee176110e283a69e5 SHA256 ba72f94e89dddced55601ace23fa03db6e2eff075df5628be99a581110e9cf4c
DIST VMware-Workstation-6.5.3-185404.x86_64.bundle 377656907 RMD160 6a8240a1b64422218425f228f6f94e006dd50e79 SHA1 8763f250a3ac5fc4698bd26319b93fecb498d542 SHA256 11484b6a759b7e1b73ccad27cdcbedb0bf3612baf40b4f3ac46b9a43d0777291
DIST VMware-Workstation-6.5.4-246459.i386.bundle 430005590 RMD160 c868ce6691b6a4e8f81b959eb3ee49f1e1705cd3 SHA1 ec78099322b5fb2a737cd74a1978a5c07382dc8a SHA256 121db45e5252175967f7a5311a6306c4b5bada8060519cf3bc55e85a9d4dea0a
DIST VMware-Workstation-6.5.4-246459.x86_64.bundle 396337936 RMD160 c8af33a4ecc4b19496fb40859d7058f30b930973 SHA1 3c0f1efae0a64fa3a41be21b0bfc962f12e0e6d8 SHA256 dff23efefb8cbc6823cb4184e7f4b519fb1d337f453b7b5d61b6cd4f43ff34e7
DIST VMware-Workstation-6.5.5-328052.i386.bundle 450181321 RMD160 b695a70c77bc8271287069cc888eac8b4e03883c SHA1 18a05e6f4f772b7f0563dbd17596b66d1db8e9fa SHA256 d2a895ae2bc38988e6426f81746c557a5d3154ca0282f9b61908dba3d1bbc1d0
DIST VMware-Workstation-6.5.5-328052.x86_64.bundle 417733505 RMD160 d41cf7f5f24dfdee97243c7612e620a3d450aee4 SHA1 58ecb2a494d4c7cc663e2028cf76c13d458fecac SHA256 9d213dca51852ce8ca38ed0a140ff205fdecd29fbef7319f26a5e052362e3d51
DIST VMware-workstation-5.5.9-126128.tar.gz 111649803 RMD160 a5a867761d36c9a02821f8dd639a95b8c9ab38bc SHA1 eb8786111a74213ea4ec24636a4ba70b7f5dc741 SHA256 71a062e29480a48647c7323883e4e4b43a9365c1bb70000a23b768647db46444
DIST vmware-any-any-update115.tar.gz 493641 RMD160 56cabe56f70c01a22a7671e861cc5a2df19855c7 SHA1 ff9b6fdf6ca74495eb5f4822a1854fc91185377c SHA256 b1c14fa9514663b85c2efe8331407e71cce96e5a21a8b941fa570c960bbdcaa1
EBUILD vmware-workstation-5.5.9.126128.ebuild 3238 RMD160 e78e4ba8a13994a82a86ed7e5485d0c1ccd1c174 SHA1 0e8dbbeca82bae9690fcbfc239cb15bb52e49dd3 SHA256 b19d796b5825ac37d522b0162c4cac8bdc5a5295a9e4d1b818a2ba99ecdf23f6
EBUILD vmware-workstation-6.5.3.185404.ebuild 5198 RMD160 7251cce2e1b73b178cb29c76a98ab6364a2d874e SHA1 6039a68569ca84cd58192a4c0f8fe6619413a299 SHA256 27652907c6a5de2abc7e0221789fb6e6c709356ee5fd1cd2e578e05f9b9d59fc
EBUILD vmware-workstation-6.5.4.246459.ebuild 5018 RMD160 db5e8a9faffc5d3b04fe51779dabda78867a06a1 SHA1 5274dcf0415764238e68fbd14cfa1dc123507e52 SHA256 c488cc5a3dabed5e4c16a7787cca10a791c3e9823372370148eb4b8f5be86779
EBUILD vmware-workstation-6.5.5.328052.ebuild 5018 RMD160 cb07886f631be3b849a037771c041debc9865619 SHA1 023cba49acefa6915bf59564f03cfb0f3c1e5c23 SHA256 369bdbb715072c8d6b6c33bf84f68b84e0fa5336d2f141c5e227aeb0b4c0bffa
MISC ChangeLog 35316 RMD160 75703ed2c4a7674608114c441c6ff2793bac8905 SHA1 05501e144deec483b6dd1289b9adf2a52e241014 SHA256 c89f3047e3dad0e2c16c856758fa99cd88bcd778c67f51d33a0e4002fe068cc7
MISC metadata.xml 347 RMD160 09578738c25495a3f945f97e2a8a51d649476a5b SHA1 89b8a5cd78b0acc29dc50ac1c890b1f67b0303e5 SHA256 2dadcb5e8783b7dad15087e3812a292a158779b3269e65e39c285228cf0b1710

View File

@ -1,31 +0,0 @@
--- vmware-distrib/bin/vmware-config.pl.ori 2005-11-09 01:45:08.000000000 +0000
+++ vmware-distrib/bin/vmware-config.pl 2005-11-09 01:48:21.000000000 +0000
@@ -8433,7 +8433,7 @@
error('Please shut down any running VMs and run this script again.' .
"\n\n");
} else {
- if (system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware')
+ if (system(shell_string('/etc/init.d' . '/vmware')
. ' stop')) {
error('Unable to stop services for ' . vmware_product_name() .
"\n\n");
@@ -8463,8 +8463,8 @@
}
if (vmware_product() ne 'server') {
configure_gtk2();
- createMimePackageFile();
- configureDesktopFiles();
+# createMimePackageFile();
+# configureDesktopFiles();
configure_mon();
configure_pp();
configure_net();
@@ -8532,7 +8532,7 @@
db_save();
# Then start VMware's services
if (!$gOption{'skipstopstart'}) {
- system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware') . ' start');
+ system(shell_string('/etc/init.d' . '/vmware') . ' start');
print "\n";
}

View File

@ -1,15 +0,0 @@
diff -urN vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl
--- vmware-distrib.orig/bin/vmware-config.pl 2005-12-16 00:51:03.000000000 -0500
+++ vmware-distrib/bin/vmware-config.pl 2005-12-21 14:34:03.000000000 -0500
@@ -7327,7 +7327,10 @@
error('Unable to write configuration file "' . $name . '".' . "\n\n");
}
db_add_file($name, 0x1);
- safe_chmod(0644, $name);
+ safe_chmod(0664, $name);
+ my $gid = (getgrnam('vmware'))[2];
+ my $uid = (stat($name))[4];
+ safe_chown($uid,$gid,$name);
# Append the promotional configuration if it exists
$promoconfig = $libdir . '/configurator/PROMOCONFIG';

View File

@ -1,15 +0,0 @@
diff -ur vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl
--- vmware-distrib.orig/bin/vmware-config.pl 2006-03-24 23:13:05.000000000 +0100
+++ vmware-distrib/bin/vmware-config.pl 2006-03-24 23:26:40.000000000 +0100
@@ -2015,9 +2015,9 @@
. shell_string($pattern));
chomp($header_page_offset);
# Ignore PAGE_OFFSET if we cannot parse it.
- if ($header_page_offset =~ /^$pattern \(?0x([0-9a-fA-F]{8,})/) {
+ if ($header_page_offset =~ /^$pattern \(?(\([^)]*\))?\)?0x([0-9a-fA-F]{8,}).*$/) {
# We found a valid page offset
- $header_page_offset = $1;
+ $header_page_offset = $2;
if (defined($gSystem{'page_offset'}) and
not (lc($header_page_offset) eq lc($gSystem{'page_offset'}))) {
if ($source eq 'user') {

View File

@ -1,17 +0,0 @@
diff -uNr vmware-server-distrib.orig/bin/vmware-config.pl vmware-server-distrib/bin/vmware-config.pl
--- vmware-server-distrib.orig/bin/vmware-config.pl 2006-02-18 18:12:26.000000000 +0000
+++ vmware-server-distrib/bin/vmware-config.pl 2006-02-18 18:14:17.000000000 +0000
@@ -8571,10 +8571,10 @@
configure_gtk2();
# createMimePackageFile();
# configureDesktopFiles();
- configure_mon();
- configure_pp();
+# configure_mon();
+# configure_pp();
configure_net();
- build_vmnet();
+# build_vmnet();
}
# Create the directory for the UNIX domain sockets

View File

@ -1,12 +0,0 @@
diff -uNr vmware-server-distrib/installer/services.sh vmware-server-distrib.new/installer/services.sh
--- vmware-server-distrib/installer/services.sh 2006-02-05 00:21:25.000000000 +0000
+++ vmware-server-distrib.new/installer/services.sh 2006-02-20 23:48:07.000000000 +0000
@@ -538,7 +538,7 @@
}
vmware_load_module() {
- /sbin/insmod -s -f "/lib/modules/`uname -r`/misc/$1.o" || exit 1
+ /sbin/modprobe -s "$1" || exit 1
exit 0
}

View File

@ -1,19 +0,0 @@
diff -uNr vmware-server-distrib.orig/installer/services.sh vmware-server-distrib/installer/services.sh
--- vmware-server-distrib.orig/installer/services.sh 2006-07-01 03:14:16.000000000 +0000
+++ vmware-server-distrib/installer/services.sh 2006-07-14 11:59:28.000000000 +0000
@@ -606,8 +606,13 @@
start)
if [ -e "$vmware_etc_dir"/not_configured ]; then
echo "`vmware_product_name`"' is installed, but it has not been (correctly) configured'
- echo 'for the running kernel. To (re-)configure it, invoke the'
- echo 'following command: '"$vmdb_answer_BINDIR"'/vmware-config.pl.'
+ echo 'for the running kernel.'
+ echo
+ echo 'Please ensure that the modules have been compiled for this kernel:'
+ echo ' emerge --oneshot vmware-modules'
+ echo
+ echo 'Also ensure '"`vmware_product_name`"' has been configured:'
+ echo ' '"$vmdb_answer_BINDIR"'/vmware-config.pl'
echo
exit 1

View File

@ -1,14 +0,0 @@
diff --git a/vmware-player-extras.py b/vmware-player-extras.py
index 21595b1..e8adf08 100644
--- a/vmware-player-extras.py
+++ b/vmware-player-extras.py
@@ -6,7 +6,8 @@ VMware Player Extras component installer.
DEST = LIBDIR/'vmware'
SETTINGS = { 'vmware.fullpath': BINDIR/'vmware', }
-CONF = DEST/'setup/vmware-config'
+import os
+CONF = path(os.environ['WORKDIR'])/'vmware-config.sh'
class PlayerExtras(Installer):

Some files were not shown because too many files have changed in this diff Show More