diff options
| author |   Mike Auty <ikelos@gentoo.org> | 2007-11-25 12:43:21 +0000 |
|---|---|---|
| committer | Mike Auty <ikelos@gentoo.org> | 2007-11-25 12:43:21 +0000 |
| commit | 06c860e610ad2b10e965cc950f350e6e2b115ec2 (patch) | |
| tree | e09d682d29f2cbf79c55dc43a5130e1c7cdeccb4 /app-emulation | |
| parent | amd64 stable wrt #200275 (diff) | |
| download | historical-06c860e610ad2b10e965cc950f350e6e2b115ec2.tar.gz historical-06c860e610ad2b10e965cc950f350e6e2b115ec2.tar.bz2 historical-06c860e610ad2b10e965cc950f350e6e2b115ec2.zip | |
Bump to vmware-any-any-update114. Also update 1.0.0.17 to use the latest vmware-player package.
Package-Manager: portage-2.1.3.19
Diffstat (limited to 'app-emulation')
11 files changed, 66 insertions, 336 deletions
diff --git a/app-emulation/vmware-modules/ChangeLog b/app-emulation/vmware-modules/ChangeLog index 21dfdd8c5ae1..eb72cb7cf9c1 100644 --- a/app-emulation/vmware-modules/ChangeLog +++ b/app-emulation/vmware-modules/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/vmware-modules # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.25 2007/10/14 09:12:53 ikelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/ChangeLog,v 1.26 2007/11/25 12:43:20 ikelos Exp $ + + 25 Nov 2007; Mike Auty <ikelos@gentoo.org> + -files/1.0.0.16-kernel-2.6.22.patch, -vmware-modules-1.0.0.16.ebuild, + vmware-modules-1.0.0.17.ebuild: + Bump to vmware-any-any-update114. Also update 1.0.0.17 to use the latest + vmware-player package. 14 Oct 2007; Mike Auty <ikelos@gentoo.org> vmware-modules-1.0.0.16-r1.ebuild: diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest index ece914f02588..de26d2e65acc 100644 --- a/app-emulation/vmware-modules/Manifest +++ b/app-emulation/vmware-modules/Manifest @@ -1,7 +1,6 @@ -AUX 1.0.0.16-kernel-2.6.22.patch 9711 RMD160 11f323a3ef79719b7a0e247812f500e10810c7ba SHA1 a2af607b88d500c506d077eefb07462d19f17f38 SHA256 9042d669eb2ec2372510c78bbe77bc0bac6c33aa96da56334a6e20a08a7bbe15 -MD5 86ad8a4019d5c72616b7bcf84bb72ea3 files/1.0.0.16-kernel-2.6.22.patch 9711 -RMD160 11f323a3ef79719b7a0e247812f500e10810c7ba files/1.0.0.16-kernel-2.6.22.patch 9711 -SHA256 9042d669eb2ec2372510c78bbe77bc0bac6c33aa96da56334a6e20a08a7bbe15 files/1.0.0.16-kernel-2.6.22.patch 9711 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX patches/000_all_makefile-include-directory.patch 342 RMD160 ae8b7c2e628681fff153bfa10242e62df5ab2e10 SHA1 be4f203063e676dc022ce600e15479b6ea56b954 SHA256 2da16602ef3c4cb040ac80a9fed18660fadcae2e843f425da0872f50aa5356db MD5 d2a8db48485977f21067a20798219821 files/patches/000_all_makefile-include-directory.patch 342 RMD160 ae8b7c2e628681fff153bfa10242e62df5ab2e10 files/patches/000_all_makefile-include-directory.patch 342 @@ -10,11 +9,9 @@ AUX patches/020_all_epoll-def-warnings.patch 435 RMD160 b9152d9af93862c99c72abc1 MD5 58b71f6120139172fa6065ab7a2a691d files/patches/020_all_epoll-def-warnings.patch 435 RMD160 b9152d9af93862c99c72abc1ef97639351d82141 files/patches/020_all_epoll-def-warnings.patch 435 SHA256 2033f23fc8d696e1a9d20c6c446703166ea82a4e5e448494e6a52ef09bac7521 files/patches/020_all_epoll-def-warnings.patch 435 -DIST VMware-player-2.0.0-45731.i386.tar.gz 66424421 RMD160 185c262e179af9cb911bfd364f063ca39a0575f5 SHA1 918ea59c3315a520ac9bd99150a1d91d958c6b9b SHA256 25a1d33f1ce50a88f046274f0499f83ab27a42c838cc552b884127d5b3701e40 -DIST VMware-player-2.0.0-45731.x86_64.tar.gz 32364670 RMD160 75a3f45b68e62d1501b5ac8359805e2499d37b33 SHA1 3a33f5a913fafd6f9e0cad6df2dfa2b3d1f51579 SHA256 52ce69de70c0f55e9f95b03a9d397276236dd133e5ea5c616304220444d6e8b1 -DIST VMware-player-2.0.1-55017.i386.tar.gz 67772207 RMD160 db563bf082c0b7618b5dcc93705edd98135a4322 SHA1 81181626aa3f7c101e2952cf7a941baed31958c4 SHA256 c05c4a88b88fe09cd5203718840121dddba0a7a371bfa8b549bb63e3a52f1d39 -DIST VMware-player-2.0.1-55017.x86_64.tar.gz 33055319 RMD160 edb9d15b97931b57b36006854366fd8ecc331988 SHA1 798bfb56c4c6c74f7c9aff78cb949dd4e71b00f7 SHA256 1c5ac84dc91e15eb898f7913cee1aaf79aecc3f56acb9f9c39a931fee4611955 -DIST vmware-any-any-update113.tar.gz 469321 RMD160 a4de5c17489dffade015f5bc3036f6ab882f749c SHA1 695e01d1d09f2d33db8ad8e6e2274b8b4a74b96d SHA256 ed15e61811f188e3c009d9fd8878cc74fd45e2b5644e21e4fe3010731841c99d +DIST VMware-player-2.0.2-59824.i386.tar.gz 67762051 RMD160 bdf0375045aa2702f0c19cf755e019307316db2e SHA1 52a9018438746ac88e965ae081120da6f8e9fbf5 SHA256 2fcaca511c0344333d9f306bab09507573c17cc4d71807a545624953cc68e138 +DIST VMware-player-2.0.2-59824.x86_64.tar.gz 33049210 RMD160 1d4351d7cc8bec4d4fe492c46656807ac2220717 SHA1 a7aace822f5a730ec7d289d074c607832abd8c72 SHA256 b0fce2e1552070d492e04ab684aa32fecf587ec06e3ab802373d5e94e0e9f72b +DIST vmware-any-any-update114.tar.gz 470728 RMD160 06beab6c71a73a94da7e95cfd846117e299a22c1 SHA1 47323b23955a9eddda396ac1970c0a0cfbd02dea SHA256 eff8a5240a2928ef14e5ec81494ea1f531c4b7ea6f9b869659e8f7ea3272fdd5 EBUILD vmware-modules-1.0.0.11-r1.ebuild 310 RMD160 7748b52659054c3b5b29181cbb35083eee30158a SHA1 7f20b5bb8808761897ccc8c395f6ee3e9d10065e SHA256 e897d58dd5b68ede4c58f02d2702dcdd0b85b16726bd8b4ec04e28a73ada8b7f MD5 20e6449837fa96d4d4b21fa5a356fb72 vmware-modules-1.0.0.11-r1.ebuild 310 RMD160 7748b52659054c3b5b29181cbb35083eee30158a vmware-modules-1.0.0.11-r1.ebuild 310 @@ -31,37 +28,37 @@ EBUILD vmware-modules-1.0.0.16-r1.ebuild 350 RMD160 1be5daf6e1bbf0a83dace59330e3 MD5 3b1bba3e7941a463ac4542d07296e6fb vmware-modules-1.0.0.16-r1.ebuild 350 RMD160 1be5daf6e1bbf0a83dace59330e327d628624cde vmware-modules-1.0.0.16-r1.ebuild 350 SHA256 191e9998c8351111566e9e2dc68ac5e20f6dd48b6ad1998eb60403b7334158bc vmware-modules-1.0.0.16-r1.ebuild 350 -EBUILD vmware-modules-1.0.0.16.ebuild 737 RMD160 0849d3403eed3a9efcad4b4162e824d56192bc4b SHA1 91649b0a43763eaa88f62a65baf74ef324203855 SHA256 848bccdf4ec0fba6e2b11c6a55d0753dfdf16745a2fee31443d39bf6e59476a9 -MD5 5fc0a7335d1359a52f0bf5a1d11c2330 vmware-modules-1.0.0.16.ebuild 737 -RMD160 0849d3403eed3a9efcad4b4162e824d56192bc4b vmware-modules-1.0.0.16.ebuild 737 -SHA256 848bccdf4ec0fba6e2b11c6a55d0753dfdf16745a2fee31443d39bf6e59476a9 vmware-modules-1.0.0.16.ebuild 737 -EBUILD vmware-modules-1.0.0.17.ebuild 634 RMD160 820132b342613337ebfe3777809868bf1b89cdda SHA1 da15677a8800613f07a006353b870868016dc1a9 SHA256 53106ac83ec5883e017d6048552603a7c03772786becaa4493943ffffa6eec01 -MD5 ddfc9ddce437be52a1e9e44c944c6d79 vmware-modules-1.0.0.17.ebuild 634 -RMD160 820132b342613337ebfe3777809868bf1b89cdda vmware-modules-1.0.0.17.ebuild 634 -SHA256 53106ac83ec5883e017d6048552603a7c03772786becaa4493943ffffa6eec01 vmware-modules-1.0.0.17.ebuild 634 -MISC ChangeLog 5881 RMD160 49c3c18b6e40ecaff0ad1d8202935261f4468dd1 SHA1 d6424c052cdd178b9976df5ba55c14431ffaf822 SHA256 f0b1f3696672fa2110dcd56b5ba7f4dbc400d9932e30b2416e91c43864724dac -MD5 ead2146a68f8185eed5b2be0bd635cab ChangeLog 5881 -RMD160 49c3c18b6e40ecaff0ad1d8202935261f4468dd1 ChangeLog 5881 -SHA256 f0b1f3696672fa2110dcd56b5ba7f4dbc400d9932e30b2416e91c43864724dac ChangeLog 5881 +EBUILD vmware-modules-1.0.0.17.ebuild 629 RMD160 6dd439afb6fca0596ba7a4a49efe910fb0cfe9fb SHA1 be38c5352769deabeb75e9161a1146b72e559660 SHA256 ca201409c490bd16874746fc37a7cbc1ce5646244560cea8424b98044ddc6760 +MD5 4b935906dab4d230150cfefa33bc007c vmware-modules-1.0.0.17.ebuild 629 +RMD160 6dd439afb6fca0596ba7a4a49efe910fb0cfe9fb vmware-modules-1.0.0.17.ebuild 629 +SHA256 ca201409c490bd16874746fc37a7cbc1ce5646244560cea8424b98044ddc6760 vmware-modules-1.0.0.17.ebuild 629 +MISC ChangeLog 6133 RMD160 6ab62443b7a78437d7b8be43b5609c2e64632430 SHA1 a8b3744911318d772d3ddf207b70385b5a22ec27 SHA256 0837dfec11d82b8338fc99d7586d341ebc5b7cc63537d54edc4b0470ed466686 +MD5 349cfab5a949f05f6a1707839d78d6e6 ChangeLog 6133 +RMD160 6ab62443b7a78437d7b8be43b5609c2e64632430 ChangeLog 6133 +SHA256 0837dfec11d82b8338fc99d7586d341ebc5b7cc63537d54edc4b0470ed466686 ChangeLog 6133 MISC metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 SHA1 f46b02a39bcd0165558de67ff4256cfc812418a3 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215 MD5 7cc95faad4185e8ed375248bc73a17fc metadata.xml 159 RMD160 fc7f68a382390e5916b0fb43f37a893fad4f9798 metadata.xml 159 SHA256 8581ae1c90a48f50fa0542c7fb28cb8984baaf12f50fa18f33e467081effb215 metadata.xml 159 -MD5 4b537193601a6e6c57094fe3f93a6275 files/digest-vmware-modules-1.0.0.11-r1 274 -RMD160 be743bc729df43dbe1845aeef80bfe7ffb8eff13 files/digest-vmware-modules-1.0.0.11-r1 274 -SHA256 8237bf1713f5b51a027a4b275f678357ba3176fd727f6dc554c40d7c2f035347 files/digest-vmware-modules-1.0.0.11-r1 274 -MD5 4b537193601a6e6c57094fe3f93a6275 files/digest-vmware-modules-1.0.0.13-r1 274 -RMD160 be743bc729df43dbe1845aeef80bfe7ffb8eff13 files/digest-vmware-modules-1.0.0.13-r1 274 -SHA256 8237bf1713f5b51a027a4b275f678357ba3176fd727f6dc554c40d7c2f035347 files/digest-vmware-modules-1.0.0.13-r1 274 -MD5 4b537193601a6e6c57094fe3f93a6275 files/digest-vmware-modules-1.0.0.15-r1 274 -RMD160 be743bc729df43dbe1845aeef80bfe7ffb8eff13 files/digest-vmware-modules-1.0.0.15-r1 274 -SHA256 8237bf1713f5b51a027a4b275f678357ba3176fd727f6dc554c40d7c2f035347 files/digest-vmware-modules-1.0.0.15-r1 274 -MD5 77d279927e77641add07d90ee33912d7 files/digest-vmware-modules-1.0.0.16 602 -RMD160 4286ca49841b4d0dc6f74897375209179ad30176 files/digest-vmware-modules-1.0.0.16 602 -SHA256 e72f459e610b2780d1788a59be29c3c83865e4a52618ae3cddf85971b916c69a files/digest-vmware-modules-1.0.0.16 602 -MD5 4b537193601a6e6c57094fe3f93a6275 files/digest-vmware-modules-1.0.0.16-r1 274 -RMD160 be743bc729df43dbe1845aeef80bfe7ffb8eff13 files/digest-vmware-modules-1.0.0.16-r1 274 -SHA256 8237bf1713f5b51a027a4b275f678357ba3176fd727f6dc554c40d7c2f035347 files/digest-vmware-modules-1.0.0.16-r1 274 -MD5 64cd03dbf04ed7df82da777e04ea204f files/digest-vmware-modules-1.0.0.17 602 -RMD160 3c0cdc18b2a638a60c2c54fc62ac7bc186255883 files/digest-vmware-modules-1.0.0.17 602 -SHA256 ac0241558885410cd161b2c58b8c448c9d47420a68a52dbef3ad39354a2bd3a9 files/digest-vmware-modules-1.0.0.17 602 +MD5 3a929e7e8ee570f4927de622981face1 files/digest-vmware-modules-1.0.0.11-r1 274 +RMD160 3802727bf21775d73666444c14ab987fabe9775e files/digest-vmware-modules-1.0.0.11-r1 274 +SHA256 512ff77000e6217eafdd934eb8699c63ed78ea4b7a96a1db1d812cc820878db7 files/digest-vmware-modules-1.0.0.11-r1 274 +MD5 3a929e7e8ee570f4927de622981face1 files/digest-vmware-modules-1.0.0.13-r1 274 +RMD160 3802727bf21775d73666444c14ab987fabe9775e files/digest-vmware-modules-1.0.0.13-r1 274 +SHA256 512ff77000e6217eafdd934eb8699c63ed78ea4b7a96a1db1d812cc820878db7 files/digest-vmware-modules-1.0.0.13-r1 274 +MD5 3a929e7e8ee570f4927de622981face1 files/digest-vmware-modules-1.0.0.15-r1 274 +RMD160 3802727bf21775d73666444c14ab987fabe9775e files/digest-vmware-modules-1.0.0.15-r1 274 +SHA256 512ff77000e6217eafdd934eb8699c63ed78ea4b7a96a1db1d812cc820878db7 files/digest-vmware-modules-1.0.0.15-r1 274 +MD5 3a929e7e8ee570f4927de622981face1 files/digest-vmware-modules-1.0.0.16-r1 274 +RMD160 3802727bf21775d73666444c14ab987fabe9775e files/digest-vmware-modules-1.0.0.16-r1 274 +SHA256 512ff77000e6217eafdd934eb8699c63ed78ea4b7a96a1db1d812cc820878db7 files/digest-vmware-modules-1.0.0.16-r1 274 +MD5 7d94407c410b455e7d9478842bea1645 files/digest-vmware-modules-1.0.0.17 602 +RMD160 69b566301ac646cf8d0d04a4cf87c3e9e34fa7c5 files/digest-vmware-modules-1.0.0.17 602 +SHA256 eb6ffc7f02ee381e269af65129504e5be6d677a978a9275771a35aa6705ac926 files/digest-vmware-modules-1.0.0.17 602 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.7 (GNU/Linux) + +iD8DBQFHSW35u7rWomwgFXoRAqNZAJ9aDSCxTU1F/yoYLbO1eyu1t4YodwCgqul/ +7lvAgVScaNK/SjsJYGiYcIQ= +=w8aD +-----END PGP SIGNATURE----- diff --git a/app-emulation/vmware-modules/files/1.0.0.16-kernel-2.6.22.patch b/app-emulation/vmware-modules/files/1.0.0.16-kernel-2.6.22.patch deleted file mode 100644 index 57c644b192fc..000000000000 --- a/app-emulation/vmware-modules/files/1.0.0.16-kernel-2.6.22.patch +++ /dev/null @@ -1,249 +0,0 @@ -diff -u -r vmnet-only.old/bridge.c vmnet-only/bridge.c ---- vmnet-only.old/bridge.c 2007-06-19 19:08:25.000000000 +0200 -+++ vmnet-only/bridge.c 2007-06-19 19:07:47.000000000 +0200 -@@ -1083,12 +1083,21 @@ - VNetBridgeComputeHeaderPos(struct sk_buff *skb) // IN: buffer to examine - { - /* Maybe some kernel gets it right... */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) -+ if (skb_transport_header(skb) != skb_network_header(skb)) { -+#else - if (skb->h.raw != skb->nh.raw) { -+#endif - return; - } -+ - switch (be16_to_cpu(skb->protocol)) { - case ETH_P_IP: -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) -+ skb->transport_header = skb->network_header + (skb_network_header(skb)[0] & 0x0F) * 4; -+#else - skb->h.raw = skb->nh.raw + (skb->nh.raw[0] & 0x0F) * 4; -+#endif - return; - default: - LOG(3, (KERN_DEBUG "Unknown EII protocol %04X: csum at %d\n", -@@ -1146,19 +1155,32 @@ - if (((struct ethhdr *)skb->mac.raw)->h_proto != htons(ETH_P_IP)) { - return ERR_PTR(-EPFNOSUPPORT); - } -- -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) -+ if (((struct iphdr *)skb_network_header(skb))->protocol != IPPROTO_TCP) { -+#else - if (skb->nh.iph->protocol != IPPROTO_TCP) { -+#endif - return ERR_PTR(-EPROTONOSUPPORT); - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) -+ macHdrLen = skb->network_header - skb->mac_header; -+ ipHdrLen = ((struct iphdr *)skb_network_header(skb))->ihl << 2; -+ tcpHdrLen = ((struct tcphdr *)skb_transport_header(skb))->doff << 2; -+#else - macHdrLen = skb->nh.raw - skb->mac.raw; - ipHdrLen = skb->nh.iph->ihl << 2; - tcpHdrLen = skb->h.th->doff << 2; -+#endif - allHdrLen = macHdrLen + ipHdrLen + tcpHdrLen; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) -+ ipID = ntohs(((struct iphdr *)skb_network_header(skb))->id); -+ seqNo = ntohl(((struct tcphdr *)skb_transport_header(skb))->seq); -+#else - ipID = ntohs(skb->nh.iph->id); - seqNo = ntohl(skb->h.th->seq); -- -+#endif - /* Host TCP stack populated this (MSS) for the host NIC driver */ - bytesPerPacket = skb_shinfo(skb)->tso_size; - -@@ -1194,10 +1216,15 @@ - memcpy(skb_put(newSkb, allHdrLen), skb->data, allHdrLen); - - /* Fix up pointers to different layers */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) -+ skb_reset_mac_header(newSkb); -+ skb_set_network_header(newSkb, macHdrLen); -+ skb_set_transport_header(newSkb, macHdrLen + ipHdrLen); -+#else - newSkb->mac.raw = newSkb->data; - newSkb->nh.raw = newSkb->data + macHdrLen; - newSkb->h.raw = newSkb->nh.raw + ipHdrLen; -- -+#endif - /* Payload copy */ - skb_copy_bits(skb, curByteOffset, newSkb->tail, payloadSize); - skb_put(newSkb, payloadSize); -@@ -1206,6 +1233,27 @@ - bytesLeft -= payloadSize; - - /* Fix up IP hdr */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) -+ ((struct iphdr *)skb_network_header(newSkb))->tot_len = htons(payloadSize + tcpHdrLen + ipHdrLen); -+ ((struct iphdr *)skb_network_header(newSkb))->id = htons(ipID); -+ ((struct iphdr *)skb_network_header(newSkb))->check = 0; -+ /* Recompute new IP checksum */ -+ ((struct iphdr *)skb_network_header(newSkb))->check = -+ ip_fast_csum((uint8 *)((struct iphdr *)skb_network_header(newSkb)), ((struct iphdr *)skb_network_header(newSkb))->ihl); -+ -+ /* Fix up TCP hdr */ -+ ((struct tcphdr *)skb_transport_header(newSkb))->seq = htonl(seqNo); -+ /* Clear FIN/PSH if not last packet */ -+ if (bytesLeft > 0) { -+ ((struct tcphdr *)skb_transport_header(newSkb))->fin = 0; -+ ((struct tcphdr *)skb_transport_header(newSkb))->psh = 0; -+ } -+ /* Recompute partial TCP checksum */ -+ ((struct tcphdr *)skb_transport_header(newSkb))->check = -+ ~csum_tcpudp_magic(((struct iphdr *)skb_network_header(newSkb))->saddr, -+ ((struct iphdr *)skb_network_header(newSkb))->daddr, -+ payloadSize+tcpHdrLen, IPPROTO_TCP, 0); -+#else - newSkb->nh.iph->tot_len = htons(payloadSize + tcpHdrLen + ipHdrLen); - newSkb->nh.iph->id = htons(ipID); - newSkb->nh.iph->check = 0; -@@ -1225,6 +1273,7 @@ - ~csum_tcpudp_magic(newSkb->nh.iph->saddr, - newSkb->nh.iph->daddr, - payloadSize+tcpHdrLen, IPPROTO_TCP, 0); -+#endif - - /* Offset of field */ - newSkb->csum = offsetof(struct tcphdr, check); -@@ -1370,8 +1419,13 @@ - # endif - - if (bridge->smac) { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) -+ if (VNetCallSMACFunc(bridge->smac, &skb, skb_mac_header(skb), -+ SMAC_CheckPacketFromHost) != -+#else - if (VNetCallSMACFunc(bridge->smac, &skb, skb->mac.raw, - SMAC_CheckPacketFromHost) != -+#endif - PacketStatusForwardPacket) { - LOG(4, (KERN_NOTICE "bridge-%s: packet dropped .\n", - bridge->name)); -@@ -1392,7 +1446,11 @@ - #endif - #endif - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) -+ skb_push(skb, skb->data - skb_mac_header(skb)); -+#else - skb_push(skb, skb->data - skb->mac.raw); -+#endif - LOG(3, (KERN_DEBUG "bridge-%s: receive %d\n", - bridge->name, (int) skb->len)); - -diff -u -r vmnet-only.old/filter.c vmnet-only/filter.c ---- vmnet-only.old/filter.c 2007-06-19 19:08:29.000000000 +0200 -+++ vmnet-only/filter.c 2007-06-19 19:07:47.000000000 +0200 -@@ -229,9 +229,22 @@ - /* When the host receives, hooknum is NF_IP_LOCAL_IN. */ - transmit = (hooknum == NF_IP_POST_ROUTING); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) -+ ip = (struct iphdr *) skb_network_header(skb); -+#else - ip = skb->nh.iph; -+#endif - packetHeader = (uint8 *)ip; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) -+ if (transmit) { -+ /* skb all set up for us. */ -+ packet = skb_transport_header(skb); -+ } else { -+ /* skb hasn't had a chance to be processed by TCP yet. */ -+ packet = skb_network_header(skb) + (ip->ihl << 2); -+ } -+#else - if (transmit) { - /* skb all set up for us. */ - packet = skb->h.raw; -@@ -239,7 +252,7 @@ - /* skb hasn't had a chance to be processed by TCP yet. */ - packet = skb->nh.raw + (ip->ihl << 2); - } -- -+#endif - HostFilterPrint(("PacketFilter: IP ver %d ihl %d tos %d len %d id %d\n" - " offset %d ttl %d proto %d xsum %d\n" - " src 0x%08x dest 0x%08x %s\n", -@@ -259,13 +272,22 @@ - * know why, but in such cases, this calculation will lead to a negative - * packetLength, and the packet to be dropped. - */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) -+ packetLength = skb->len - (skb->network_header - skb->mac_header) - (ip->ihl << 2); -+#else - packetLength = skb->len - (skb->nh.raw - skb->mac.raw) - (ip->ihl << 2); -+#endif - } - - if (packetLength < 0) { - HostFilterPrint(("PacketFilter: ill formed packet for IPv4\n")); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) -+ HostFilterPrint(("skb: len %d h.raw %p nh.raw %p mac.raw %p, packetLength %d\n", -+ skb->len, skb_transport_header(skb), skb_network_header(skb), skb_mac_header(skb), packetLength)); -+#else - HostFilterPrint(("skb: len %d h.raw %p nh.raw %p mac.raw %p, packetLength %d\n", - skb->len, skb->h.raw, skb->nh.raw, skb->mac.raw, packetLength)); -+#endif - verdict = NF_DROP; - DropPacket(VNET_FILTER_ACTION_DRP_SHORT, packetHeader, packet, 0); - goto out_unlock; -diff -u -r vmnet-only.old/userif.c vmnet-only/userif.c ---- vmnet-only.old/userif.c 2007-06-19 19:08:34.000000000 +0200 -+++ vmnet-only/userif.c 2007-06-19 19:07:47.000000000 +0200 -@@ -627,13 +627,21 @@ - */ - if (skb->pkt_type == PACKET_OUTGOING && /* Packet must be outgoing */ - skb->ip_summed == VM_CHECKSUM_PARTIAL && /* Without checksum */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) -+ skb->transport_header != skb->network_header && /* We must know where header is */ -+#else - skb->h.raw != skb->nh.raw && /* We must know where header is */ -+#endif - skb->len == count) { /* No truncation may occur */ - size_t skl; - int csum; - u_int16_t csum16; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) -+ skl = skb_transport_header(skb) - skb->data; -+#else - skl = skb->h.raw - skb->data; -+#endif - if (VNetCopyDatagram(skb, buf, skl)) { - return -EFAULT; - } -diff -u -r vmnet-only.old/vnetInt.h vmnet-only/vnetInt.h ---- vmnet-only.old/vnetInt.h 2007-06-19 19:08:41.000000000 +0200 -+++ vmnet-only/vnetInt.h 2007-06-19 19:07:47.000000000 +0200 -@@ -22,6 +22,15 @@ - skb_datarefp(clone) == skb_datarefp(skb) \ - ) - #endif -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22) -+#define DEV_QUEUE_XMIT(skb, dev, pri) ( \ -+ (skb)->dev = (dev), \ -+ (skb)->priority = (pri), \ -+ skb_reset_mac_header(skb), \ -+ skb_set_network_header(skb, sizeof (struct ethhdr)), \ -+ dev_queue_xmit(skb) \ -+ ) -+#else - #define DEV_QUEUE_XMIT(skb, dev, pri) ( \ - (skb)->dev = (dev), \ - (skb)->priority = (pri), \ -@@ -29,6 +38,7 @@ - (skb)->nh.raw = (skb)->data + sizeof (struct ethhdr), \ - dev_queue_xmit(skb) \ - ) -+#endif - #ifdef KERNEL_2_3_15 - # define dev_lock_list() read_lock(&dev_base_lock) - # define dev_unlock_list() read_unlock(&dev_base_lock) diff --git a/app-emulation/vmware-modules/files/digest-vmware-modules-1.0.0.11-r1 b/app-emulation/vmware-modules/files/digest-vmware-modules-1.0.0.11-r1 index 3723f2ec0d48..78062f7e0f98 100644 --- a/app-emulation/vmware-modules/files/digest-vmware-modules-1.0.0.11-r1 +++ b/app-emulation/vmware-modules/files/digest-vmware-modules-1.0.0.11-r1 @@ -1,3 +1,3 @@ -MD5 cb3f91f2196778e6d76d5a6697286d04 vmware-any-any-update113.tar.gz 469321 -RMD160 a4de5c17489dffade015f5bc3036f6ab882f749c vmware-any-any-update113.tar.gz 469321 -SHA256 ed15e61811f188e3c009d9fd8878cc74fd45e2b5644e21e4fe3010731841c99d vmware-any-any-update113.tar.gz 469321 +MD5 34377ba9387804329c4a94619cc7efac vmware-any-any-update114.tar.gz 470728 +RMD160 06beab6c71a73a94da7e95cfd846117e299a22c1 vmware-any-any-update114.tar.gz 470728 +SHA256 eff8a5240a2928ef14e5ec81494ea1f531c4b7ea6f9b869659e8f7ea3272fdd5 vmware-any-any-update114.tar.gz 470728 diff --git a/app-emulation/vmware-modules/files/digest-vmware-modules-1.0.0.13-r1 b/app-emulation/vmware-modules/files/digest-vmware-modules-1.0.0.13-r1 index 3723f2ec0d48..78062f7e0f98 100644 --- a/app-emulation/vmware-modules/files/digest-vmware-modules-1.0.0.13-r1 +++ b/app-emulation/vmware-modules/files/digest-vmware-modules-1.0.0.13-r1 @@ -1,3 +1,3 @@ -MD5 cb3f91f2196778e6d76d5a6697286d04 vmware-any-any-update113.tar.gz 469321 -RMD160 a4de5c17489dffade015f5bc3036f6ab882f749c vmware-any-any-update113.tar.gz 469321 -SHA256 ed15e61811f188e3c009d9fd8878cc74fd45e2b5644e21e4fe3010731841c99d vmware-any-any-update113.tar.gz 469321 +MD5 34377ba9387804329c4a94619cc7efac vmware-any-any-update114.tar.gz 470728 +RMD160 06beab6c71a73a94da7e95cfd846117e299a22c1 vmware-any-any-update114.tar.gz 470728 +SHA256 eff8a5240a2928ef14e5ec81494ea1f531c4b7ea6f9b869659e8f7ea3272fdd5 vmware-any-any-update114.tar.gz 470728 diff --git a/app-emulation/vmware-modules/files/digest-vmware-modules-1.0.0.15-r1 b/app-emulation/vmware-modules/files/digest-vmware-modules-1.0.0.15-r1 index 3723f2ec0d48..78062f7e0f98 100644 --- a/app-emulation/vmware-modules/files/digest-vmware-modules-1.0.0.15-r1 +++ b/app-emulation/vmware-modules/files/digest-vmware-modules-1.0.0.15-r1 @@ -1,3 +1,3 @@ -MD5 cb3f91f2196778e6d76d5a6697286d04 vmware-any-any-update113.tar.gz 469321 -RMD160 a4de5c17489dffade015f5bc3036f6ab882f749c vmware-any-any-update113.tar.gz 469321 -SHA256 ed15e61811f188e3c009d9fd8878cc74fd45e2b5644e21e4fe3010731841c99d vmware-any-any-update113.tar.gz 469321 +MD5 34377ba9387804329c4a94619cc7efac vmware-any-any-update114.tar.gz 470728 +RMD160 06beab6c71a73a94da7e95cfd846117e299a22c1 vmware-any-any-update114.tar.gz 470728 +SHA256 eff8a5240a2928ef14e5ec81494ea1f531c4b7ea6f9b869659e8f7ea3272fdd5 vmware-any-any-update114.tar.gz 470728 diff --git a/app-emulation/vmware-modules/files/digest-vmware-modules-1.0.0.16 b/app-emulation/vmware-modules/files/digest-vmware-modules-1.0.0.16 deleted file mode 100644 index d72377a4b5b8..000000000000 --- a/app-emulation/vmware-modules/files/digest-vmware-modules-1.0.0.16 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 090b02f6a49dd3a4e8617f68e1d2dc7b VMware-player-2.0.0-45731.i386.tar.gz 66424421 -RMD160 185c262e179af9cb911bfd364f063ca39a0575f5 VMware-player-2.0.0-45731.i386.tar.gz 66424421 -SHA256 25a1d33f1ce50a88f046274f0499f83ab27a42c838cc552b884127d5b3701e40 VMware-player-2.0.0-45731.i386.tar.gz 66424421 -MD5 2bfbc79f548f082818b44b980d9e1c71 VMware-player-2.0.0-45731.x86_64.tar.gz 32364670 -RMD160 75a3f45b68e62d1501b5ac8359805e2499d37b33 VMware-player-2.0.0-45731.x86_64.tar.gz 32364670 -SHA256 52ce69de70c0f55e9f95b03a9d397276236dd133e5ea5c616304220444d6e8b1 VMware-player-2.0.0-45731.x86_64.tar.gz 32364670 diff --git a/app-emulation/vmware-modules/files/digest-vmware-modules-1.0.0.16-r1 b/app-emulation/vmware-modules/files/digest-vmware-modules-1.0.0.16-r1 index 3723f2ec0d48..78062f7e0f98 100644 --- a/app-emulation/vmware-modules/files/digest-vmware-modules-1.0.0.16-r1 +++ b/app-emulation/vmware-modules/files/digest-vmware-modules-1.0.0.16-r1 @@ -1,3 +1,3 @@ -MD5 cb3f91f2196778e6d76d5a6697286d04 vmware-any-any-update113.tar.gz 469321 -RMD160 a4de5c17489dffade015f5bc3036f6ab882f749c vmware-any-any-update113.tar.gz 469321 -SHA256 ed15e61811f188e3c009d9fd8878cc74fd45e2b5644e21e4fe3010731841c99d vmware-any-any-update113.tar.gz 469321 +MD5 34377ba9387804329c4a94619cc7efac vmware-any-any-update114.tar.gz 470728 +RMD160 06beab6c71a73a94da7e95cfd846117e299a22c1 vmware-any-any-update114.tar.gz 470728 +SHA256 eff8a5240a2928ef14e5ec81494ea1f531c4b7ea6f9b869659e8f7ea3272fdd5 vmware-any-any-update114.tar.gz 470728 diff --git a/app-emulation/vmware-modules/files/digest-vmware-modules-1.0.0.17 b/app-emulation/vmware-modules/files/digest-vmware-modules-1.0.0.17 index 8032defec759..8ceba3dadd62 100644 --- a/app-emulation/vmware-modules/files/digest-vmware-modules-1.0.0.17 +++ b/app-emulation/vmware-modules/files/digest-vmware-modules-1.0.0.17 @@ -1,6 +1,6 @@ -MD5 2d1b2d847cf002b2f418b94f5b973ecc VMware-player-2.0.1-55017.i386.tar.gz 67772207 -RMD160 db563bf082c0b7618b5dcc93705edd98135a4322 VMware-player-2.0.1-55017.i386.tar.gz 67772207 -SHA256 c05c4a88b88fe09cd5203718840121dddba0a7a371bfa8b549bb63e3a52f1d39 VMware-player-2.0.1-55017.i386.tar.gz 67772207 -MD5 dca7a144e1a01c69387401e46e7e3b26 VMware-player-2.0.1-55017.x86_64.tar.gz 33055319 -RMD160 edb9d15b97931b57b36006854366fd8ecc331988 VMware-player-2.0.1-55017.x86_64.tar.gz 33055319 -SHA256 1c5ac84dc91e15eb898f7913cee1aaf79aecc3f56acb9f9c39a931fee4611955 VMware-player-2.0.1-55017.x86_64.tar.gz 33055319 +MD5 0c108db615943d71b78f18826611acce VMware-player-2.0.2-59824.i386.tar.gz 67762051 +RMD160 bdf0375045aa2702f0c19cf755e019307316db2e VMware-player-2.0.2-59824.i386.tar.gz 67762051 +SHA256 2fcaca511c0344333d9f306bab09507573c17cc4d71807a545624953cc68e138 VMware-player-2.0.2-59824.i386.tar.gz 67762051 +MD5 f59a77f3e3b8e87591eff605c4bbb796 VMware-player-2.0.2-59824.x86_64.tar.gz 33049210 +RMD160 1d4351d7cc8bec4d4fe492c46656807ac2220717 VMware-player-2.0.2-59824.x86_64.tar.gz 33049210 +SHA256 b0fce2e1552070d492e04ab684aa32fecf587ec06e3ab802373d5e94e0e9f72b VMware-player-2.0.2-59824.x86_64.tar.gz 33049210 diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.16.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.16.ebuild deleted file mode 100644 index 2a5366537030..000000000000 --- a/app-emulation/vmware-modules/vmware-modules-1.0.0.16.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.16.ebuild,v 1.5 2007/10/14 08:55:10 ikelos Exp $ - -KEYWORDS="-* ~amd64 ~x86" -VMWARE_VER="VME_V6" # THIS VALUE IS JUST A PLACE HOLDER - -inherit eutils vmware-mod - -VMWARE_MODULE_LIST="vmmon vmnet vmblock" -SRC_URI="x86? ( mirror://vmware/software/vmplayer/VMware-player-2.0.0-45731.i386.tar.gz ) - amd64? ( mirror://vmware/software/vmplayer/VMware-player-2.0.0-45731.x86_64.tar.gz )" -VMWARE_MOD_DIR="vmware-player-distrib/lib/modules/source/" - -src_unpack() { - vmware-mod_src_unpack - cd "${WORKDIR}" - epatch "${FILESDIR}"/${PV}-kernel-2.6.22.patch -} diff --git a/app-emulation/vmware-modules/vmware-modules-1.0.0.17.ebuild b/app-emulation/vmware-modules/vmware-modules-1.0.0.17.ebuild index e933714dc754..217e9c324b39 100644 --- a/app-emulation/vmware-modules/vmware-modules-1.0.0.17.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-1.0.0.17.ebuild @@ -1,13 +1,14 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.17.ebuild,v 1.2 2007/10/15 01:15:27 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vmware-modules/vmware-modules-1.0.0.17.ebuild,v 1.3 2007/11/25 12:43:20 ikelos Exp $ -KEYWORDS="-* ~amd64 ~x86" +KEYWORDS="~amd64 ~x86" VMWARE_VER="VME_V6" # THIS VALUE IS JUST A PLACE HOLDER inherit eutils vmware-mod VMWARE_MODULE_LIST="vmmon vmnet vmblock" -SRC_URI="x86? ( mirror://vmware/software/vmplayer/VMware-player-2.0.1-55017.i386.tar.gz ) - amd64? ( mirror://vmware/software/vmplayer/VMware-player-2.0.1-55017.x86_64.tar.gz )" +SRC_URI="x86? ( mirror://vmware/software/vmplayer/VMware-player-2.0.2-59824.i386.tar.gz ) + amd64? ( mirror://vmware/software/vmplayer/VMware-player-2.0.2-59824.x86_64.tar.gz )" VMWARE_MOD_DIR="vmware-player-distrib/lib/modules/source/" + |