--- vmware-source-update115.orig/Changelog +++ vmware-source-update115/Changelog @@ -0,0 +1,359 @@ + Refresh vmblock & vmnet. + Fix build on 2.6.24-rc2,3. 2.6.24-rc1 is not supported, please upgrade. + --- update114 --- + Fix vmnet build on post 2.6.23 kernels. You need compat_netdevice.h + from this tarball also if you want to build vmxnet. But as + tools are now opensourced, help yourself. + --- update113 --- + Change ASSERT_ON_COMPILE to make g++ 3.4 happy. + --- update112 --- + Support for WS6.0 is now present in the package. I've tested + WS6.0, 5.5.4, 5.0.0, 4.5.2, and 3.2.1, on 2.6.23-rc1, with + following results: WS6.0 works fine with either kernel. + WS4.5.2, 5.0.0, 5.5.4 work only with 32bit kernel (hang on + 64bit kernel: http://lkml.org/lkml/2007/5/2/151). My + glibc is too new for 3.2.1, so it did not start at all. + I did not test WS 2.0.4 as it would not run either... + Probably time to drop support for anything below WS 4.5.3 + and Server 1.0... + --- update111 --- + Fix build on post-2.6.22 kernels. + Still no WS6.0 support, do not install on systems with WS6.0! + --- update110 --- + Fix build on post-2.6.21 kernels. + Refresh vmnet code from WS6.0. If you are using WS6, you can use + vmnet from this package. For vmmon you must continue using + one you have received with WS6.0. + --- update109 --- + Fix build issue on Fedora Core 7 kernels. They are broken, but users + are complaining... You should really stick to official Linus + kernels, your life will be much happier then... + --- update108 --- + Fix new paravirt_ops use - outb_p is no longer allowed from non-GPL + modules! Way to go! + --- update107 --- + Fix missing paravirt_ops symbol on 2.6.20-rc6 kernels. Unfortunately + paravirt_ops we pushed are GPL only, while our vmmon is still not + GPLed. What can I say except 'oops!' ? + --- update106 --- + Fix undefined _syscall1() on 2.6.19, and get rid of errno variable. + --- update105 --- + Get C++ code to build on recent kernels. + CHECKSUM_HW was renamed to CHECKSUM_PARTIAL (well, and CHECKSUM_COMPLETE, + but only vmxnet cares about CHECKSUM_COMPLETE). + --- update104 --- + Try including asm/processor.h before asm/system.h to fix i386 build. + --- update103 --- + Use different kbuild definition to work around SUSE10.1 bugs. + --- update102 --- + Add support for kernels 2.6.18-rc1 and newer. + Add support for broken Debian's modpost. + Add support for released Server 1.0.0. + --- update101 --- + Add 'VMWARE_DEBUG_AUTOCONF=y' tests to print out errors/warnings + emited during autoconfiguration phase. Hopefully it will make + some debugging a bit simpler. + --- update100 --- + Add support for Server 1.0 beta 2. + Fix vmmon build on 2.6.16 kernel. + --- update99 --- + Add support for Server 1.0 beta 1 refresh. We need it for FC5 + support. + --- update98 --- + gcc-3.4 is even dumbier (see update73) than I've thought. Besides + always_inline even simple inline kills it. + --- update97 --- + Add GSX 3.2.1, WS 5.5.x, Player 1.0.x and Server 1.0 beta 1 support. + Lot of changes and updates. If you are using some older product and + you'll find that this version reboots your box, complain loudly. + If you are using wireless bridged networking, please note that this + version does NOT support such feature. + --- update96 --- + Fix vmnet error 515 on WS4.0 and older products. + --- update95 --- + Fix problem with memory locking on 2.6.15-rc1 and newer kernel. + Added GSX 3.2.0 support. + Add some changes to be ready when WS5.5 gets released. + --- update94 --- + Remove code to print processes using vmnet device from vmnet. It needs RCU, + and RCU is patented for non-GPL uses. Sorry, boys. + Added defined(_MSC_VER) here and there to shut up some warnings. + Updated vmnet for different API of dev_add_pack() callback in 2.6.14-rc1+ + --- update93 --- + Update with current code. + Add code to display more detailed error message when Task_InitCrosspage fails. + Split old code from *.c to *_compat.h, to get smaller diffs and more + maintainable code. + --- update92 --- + Add support for kernels without register_ioctl32_conversion. And fix it + for broken FC4. Oh well... + --- update91 --- + Work around problem when cpu MHz is reported as '0.000 MHz' in /proc/cpuinfo. + No idea how such thing can happen, but it happens... SUSE, what else... + --- update90 --- + Add changes from final WS5.0. + Drop support for WS5.0 betas. + Add support for 2.6.12-rc2 kernel to vmnet. + Fix crashes while running GSX 3.1.0 on EM64T system with 64bit kernel. + Hopefully... + --- update89 --- + Change code to use skb_copy_datagram_iovec instead of skb_copy_datagram + which disappeared in 2.6.11-rc2. + --- update88 --- + Added code to recognize WS5.0 beta 2 refresh build 11888. Note that for + you may have to do 'rm /etc/vmware/not_configured' before running + vmware-config.pl, as WS5.0 beta 2 does not report version properly + when /etc/vmware/not_configured exists. + --- update87 --- + Update with current code. + Fix build on current 2.6.11-pre which added pud_t into middle of page + tables hierarchy instead of expected pml4_t to the top. + --- update86 --- + Fix Task_InitCrossPage_TOT on x86-64. + --- update85 --- + Merge WS5.0 beta 2: + * Remove udev support from vmnet. License of API does not allow us to + use it. + * Also accept other vmmon & vmnet changes from WS5.0 beta 2. + * Update initscript to create /dev/vmnet* when needed. This kludge is + needed due to license on udev API. + * Also accept other initscript changes from WS5.0 beta 2. + Fix automatic start of virtual machines when using GSX. + Simplify VMware Workstation 2/VMware Express initscript. + Note that this version does not build on x86-64... + --- update84 --- + Add udev support to vmnet. + Tweak vmmon code here and there. x86-64 box finally arrived. + --- update83 --- + Fix issues with GSX3.1 - it was not recognized by vmmon. + Fix issues with x86-64 hosts. + --- update82 --- + Fix issues with VMware 3.2.1 and recent 2.6.8-mmX. Other VMware WS 3.x, + and GSX 2.5.x cannot be used with 2.6.8-mm1 or newer kernels. + --- update81 --- + One bug in x86-64 fixed, another introduced. LA is now 8 byte on + x86-64. Everybody wants LA32 instead of LA now. This version + was tested with crosscompiler, finally. + --- update80 --- + One more fix to x86-64 build: MODULECALL_CROSS_PAGE_START does not + exist, code is supposed to use either MODULECALL_CROSS_PAGE_START_TOT, + or class function crosspageStart(). Now, hopefully... + --- update79 --- + Fix build on x86-64: some VMCrossPage references in task.c, and + dependence on linux/syscalls.h which was not there in early + 2.6.x kernels. Now it imports sys_ioctl as a weak symbol, + so everything and everybody should be happy. If you'll get + message that USB will not work for you, it is true message, + and if some future product will support it on x86-64 host, + it will not work on your kernel (IMHO time to upgrade). If + you are using WS4.5.2, you can safely ignore that message, + WS4.5.2 does not contain x86-64 support for USB. + vmnet resync with latest code. + --- update78 --- + Oops. Update77 tested for UP 2.6.8 instead of SMP 2.4.9. Leftover from + testing... + --- update77 --- + Do not send async IPIs on 2.4.9 kernels - RedHat AS 2.1 kernels contain + bad bug in this code, and as they are not willing to acknowledge + it, we have to work around. Expect very bad performance on SMP + 2.4.9 hosts, but it should be better than random host crashes. + --- update76 --- + vmmon resync with latest code: typos, new x86-64 crosspage interface. + vmnet resync with latest code: typos, cleanups, increase interface name + length from 8 to 32 (you need your own tool instead of released + vmnet-bridge). + Fix packet duplications with bridged networking on 2.6.0+ kernels. + --- update75 --- + Use dev_set_promiscuity() instead of accessing IFF_PROMISC directly. + Now vlan should work in any configuration. + --- update74 --- + Include on 2.6.x x86_64 kernels. + Assorted fixes here and there. + --- update73 --- + Renumber SIOCSVMIFBR to match with value I used in official code. + Work around g++ 3.4.0 bug which cannot handle always_inline attribute + on templates. + --- update72 --- + After update71 broke bridged networking even for ia32, this one should + fix both of them. Swapped SIOCSVMIFBR and SIOCGVMIFBR definitions. + --- update71 --- + Fix build on recent RedHat x86_64 kernels. + Fix bridged networking breakage on all recent x86_64 kernels. + --- update70 --- + Fix missing semicolon in task.c. + Fix bad security bug in 32->64 translation layer, which could have been + used to crash x86_64 kernels, if not something worse. + --- update69 --- + Added support for WS4.5.2. + While adding support for WS4.5.2 I hopefully finally found why WS4.5.1 + was crashing on x86-64 - when updating vmmon some time ago I missed + that CS64 and CS32 got swapped in crosspage... + --- update68 --- + Fix build on post-2.6.6 kernels. + BTW, fix in update67 is not sufficient for SuSE9.1... + --- update67 --- + Maybe fix x86_64 crashes with SuSE9.1. Who knows. + --- update66 --- + Fix vmmon autoconf detection on 2.4.26 (br0ken acpi headers). + Fix vmmon build with g++ 2.95. + --- update65 --- + Allow transmission of 1518 byte packets from guest. So you can do + VLAN in the guest without host knowing about that. + --- update64 --- + Fix vmnet bug introduced in update62. + Strict structure sizes checks, so we do not mess ABI by mistake. + --- update63 --- + Misc upgrades in update62 missed MODULE_X86_64 => VM_X86_64 in two + places. + --- update62 --- + Misc upgrades. + Make vmnet buildable on 2.4.26 with SCTP enabled. + --- update61 --- + Add #include "driver-config.h" into compilercheck.c. Hopefully it will + fix RedHat's 2.4.20-30.9 brokeness. + --- update60 --- + Fix build with 4GB/4GB user/kernel split. + Remove .tmp_versions in 'make clean'. + --- update59 --- + Fix build with 2.6.6-rc1. -D__KERNEL__ moved from CFLAGS to CPPFLAGS. + --- update58 --- + Add support for VMware Express on 2.6.x kernels. + Revert SYSENTER code back to what WS4.5.1 did. Should fix some random + system crashes with some 2.6.x hosts. + Reenable linux/compile.h inclusion on systems which provide that file. + So only broken systems are penalized. + Sync with current codebase. + --- update57 --- + Fix typo in one #ifdef MODULE_X86_64 directive. + Stop including linux/compile.h. Some distros do not distribute this file + together with kernel. How I could expect that something will nicely + work?! + --- update56 --- + Recognize & support GSX3.0. + Fix compilation on x86-64. It builds and can be insmodded. + Added .properties section to vmmon which lists details about how/when + was vmmon compiled. It can be used for adding module to prebuilt + modules in /usr/lib/vmware/modules/binary/... and hopefully + RedHat & SuSE will do that. + --- update55 --- + Fix vmnet: it used uninitialized memory in recently added + recvClusterPage pointer. + --- update54 --- + Update vmmon & vmnet code to latest version. Asorted bugfixes, typos & + restructuring. + --- update53 --- + And winner is... gcc. Fix "can't find a register in class `GENERAL_REGS' + while reloading `asm'" error. + --- update52 --- + Fix miscompilation in SwitchToMonitor with some gcc versions. + --- update51 --- + Added support for building modules for 2.6.x kernels built with + KBUILD_OUTPUT=... defined in the environment. Due to + vmware-config.pl you cannot build modules in these configurations + with simple 'vmware-config.pl', but direct 'make' in untarred vmmon + & vmnet packages should work. + Now everything is autodetected through gcc, instead of using grep. + It was needed for proper KBUILD_OUTPUT support. + --- update50 --- + Fix support for 2.6.3, which removed _exit() function from kernel. + Work around SuSE brokeness - they distribute kernel sources, but without + .config file - so vmmon/vmnet build fails with error saying that + current kernel is built without CONFIG_MODULES support. Now you'll + get a bit better diagnostics. + --- update49 --- + Update code to handle WS4.5. Not that you should need this module + for WS4.5, update49 should be functionally identical to WS4.5's + modules. + Work around brokeness available from RedHat under name RHEL3 update1. + Are there really people willing to pay for that? + Some more compatibility stuff - SKAS patch should be autodetected. + --- update48 --- + Add new update pattern for WS 2.0.4 running on 2.6.x kernel. + Fix vmmon build on latest RedHat crapolas. + --- update47 --- + Fix crash when get_user_pages() fails. + When get_user_pages() fails, tell to the user that he has broken kernel, + and attempt to walk page tables directly. Probably crashes on SuSE, + but when they do not support walking page tables, and they cannot + get get_user_pages() to work, their customers have to suffer from + consequences. + I'm repeating again and again: use only kernels from ftp.kernel.org, + not vendor trees or some obscure patches! + --- update46 --- + Update with new features. + Add support for 2.6.1 kernels. + --- update45 --- + Fix some compilation warnings. + --- update44 --- + Change build system to use kernel Makefiles. It is required for + 2.6.x kernels from RedHat. If you cannot build update44, please + use update43 and drop me a note with 'vmware-config.pl' output + and description of your system, kernel packages and so on. + --- update43 --- + update42 did not work very well for host-guest communication. Apply + necessary changes for < 2.6.0 kernels, and point out that 2.6.0-test7 + needs 2.6.0-test7-patch.patch from this directory. 2.6.0-test1 to + 2.6.0-test6 are unsupported. + --- update42 --- + Change vmnet bridge to get to build on 2.6.0-test7. + --- update41 --- + Fix crash on vmnet shutdown on 2.6.0-test6. + --- update40 --- + Fix compile error on latest 2.6.0-test5 kernels due to changes + in misc_device interface. + Fix might_sleep() complaints when running VMware4.x. + --- update39 --- + Add support for bridged networking on adapter which are using + hardware IP/UDP/TCP checksumming. + --- update38 --- + Remove linux-2.0 compatibility code. + Add support for SLES8. + Fix driver's mmap support on SuSE. + --- update37 --- + Finally added -fno-strict-aliasing to Makefile... + Added support for Ingo's 4GB/4GB kernel configuration. + --- update36 --- + Fix also vmnet for pmd in high memory. + --- update35 --- + Add support for pmd in high memory. Thanks to Peter C. Ndikuwera + for pointing this change in 2.5.74-mm2. + --- update34 --- + Make vmmon.tar selfcontained. It included linux/wrapper.h from + /usr/include on 2.5.69+ kernels. Thanks to Eelco Vriezekolk + who pointed this out. + --- update33 --- + Add support for newer revisions of 2.5.70 kernels. + Strip unnecessary code from vmnet. + --- update32 --- + Remove support for changing suid through vmmon. + --- update31 --- + Add support for VMware 3.2.1. + Quiet warnings when building with gcc 3.3. + --- update30 --- + Fix BUG() in net_family_bug with latest 2.5.68-bk + --- update29 --- + Fix build with g++ 2.95 which chokes on template containing + asm volatile () statements. + --- update28 --- + Fix build with g++ < 3.2, which chokes on '::' in asm statements. + --- update27 --- + Fix build on SuSE 8.2 (from Markus Kossmann). + --- update26 --- + New code, synced to the VMware 4 codebase. + --- update25 --- + Fixes performance problems with networking on >= 2.4.6. + Allows you running VMware on 2.5.x (last tested 2.5.67). + Use 2.5.x kernels on your own risk. + Fixed deadlock on SMP with bridged networking. + Fixes 'APIC error 80(80)' on Pentium SMP systems (only 80, all + other APIC error values mean that you have hardware unsuitable + for SMP and nothing can fix it, except your system vendor). + Fixes failure when vmmon is already loaded. + Fixes crashes when eth0 exists, but is down. + Fixes incompatibility with glibc-2.2.6/2.3.x. + Same package for all products: VMware Express, VMware Workstation 2, + VMware Workstation 3, GSX Server 1 and GSX Server 2. + Do not use with VMware 2/3.[01] on SuSE 8 systems with more than + 850MB of memory! You MUST upgrade to VMware 3.2. + Do not use on systems with > 4GB memory with VMware Workstations! You + MUST upgrade to VMware GSX Server 2. --- vmware-source-update115.orig/debian/control.modules.in +++ vmware-source-update115/debian/control.modules.in @@ -0,0 +1,26 @@ +Source: vmware-source +Section: non-free/otherosfs +Priority: extra +Maintainer: Frédéric Brière +Build-Depends: debhelper (>> 4.0.0) +Standards-Version: 3.7.2 + +Package: vmware-modules-_KVERS_ +Architecture: i386 +Provides: vmware-modules +Suggests: vmware +Description: Intel x86-based virtual machine - kernel modules + VMware Workstation is an execution environment for operating systems + running on Intel x86-based hardware. It gives an OS the illusion of + running on standard PC hardware, but it isolates it from the real + hardware and from other activities of the host OS. Thus multiple OSes + may run simultaneously on the same machine: one of them (the host OS) + on the real hardware, the others (the guest OSes) inside vmware. + . + This package contains the VMware modules, compiled for kernel + _KVERS_ + . + If you have compiled your own kernel, you will most likely need to build + your own vmware-modules. The vmware-source package has been provided for + use with the Debian's module-assistant or kernel-package utilities to + produce a version of vmware-module for your kernel. --- vmware-source-update115.orig/debian/rules +++ vmware-source-update115/debian/rules @@ -0,0 +1,59 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. +# +# This version is for a hypothetical package that can build a kernel modules +# architecture-dependant package via make-kpkg, as well as an +# architecture-independent module source package, and other packages +# either dep/indep for things like common files or userspace components +# needed for the kernel modules. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + +DEB_TARBALL = +include /usr/share/cdbs/1/rules/debhelper.mk + +#DEB_DH_INSTALL_SOURCEDIR = $(CURDIR)/debian/tmp +DEB_INSTALL_CHANGELOG_ALL = Changelog + + +# Name of the source package +psource := vmware-source + +# The short upstream name, used for the module source directory +sname := vmware + + +#install: DH_OPTIONS= +install/vmware-source:: + # Create the directories to install the source into + dh_installdirs -p$(psource) usr/src/modules/$(sname)/debian + + tar xf vmmon.tar \ + -C debian/$(psource)/usr/src/modules/$(sname) + tar xf vmnet.tar \ + -C debian/$(psource)/usr/src/modules/$(sname) + + dh_install -p$(psource) debian/patches \ + usr/src/modules/$(sname)/debian/ + + # Copy the needed debian/ pieces to the proper location + dh_install -p$(psource) \ + debian/{changelog,copyright,compat,*modules.in*} \ + usr/src/modules/$(sname)/debian/ + + install -m755 debian/rules.modules \ + debian/$(psource)/usr/src/modules/$(sname)/debian/rules + + cp debian/Makefile.modules \ + debian/$(psource)/usr/src/modules/$(sname)/Makefile + cp Changelog debian/$(psource)/usr/src/modules/$(sname)/ + + cd debian/$(psource)/usr/src && tar c modules | bzip2 -9 > $(sname).tar.bz2 && rm -rf modules + --- vmware-source-update115.orig/debian/compat +++ vmware-source-update115/debian/compat @@ -0,0 +1 @@ +5 --- vmware-source-update115.orig/debian/Makefile.modules +++ vmware-source-update115/debian/Makefile.modules @@ -0,0 +1,54 @@ +# With any luck, the defaults should be appropriate, and you can simply run +# "make install". Otherwise, provide appropriate values on the command +# line, like thus: +# +# make install KSRC=/usr/local/src/linux-2.4 +# +# (I've drawn a lot of inspiration from the i2c Makefile. Thanks guys!) + + +# Kernel version to compile for. We take the current running kernel at +# first, but we'll know better later on. +# +KVERS := $(shell uname -r) + +# Location of the Linux source tree. This should work automatically if +# we're building for the current kernel; otherwise it is expected to be in +# /usr/src/linux. +# +KSRC := $(shell if [ -L /lib/modules/$(KVERS)/build ] ; \ + then echo "/lib/modules/$(KVERS)/build" ; \ + else echo "/usr/src/linux" ; fi) + +# Now that we have the source, we can make sure we have the *right* version +KVERS := $(shell grep UTS_RELEASE $(KSRC)/include/linux/version.h|cut -f 2 -d'"') + +# Try to find out if SMP is enabled. +# +SMP := $(shell if grep -q '^[[:space:]]*\#define[[:space:]]*CONFIG_SMP[[:space:]]*1' $(KSRC)/include/linux/autoconf.h ; \ + then echo 1; else echo 0; fi) + +# This is the directory into which the modules will be installed. +# +MODPREF := /lib/modules/$(KVERS)/misc + +# If you want to isntall everything at some other place then at which +# you will run it, DESTDIR defines a prefix used at installation-time. +# +DESTDIR := + +build: + rm -rf *.o *.ko + $(MAKE) VM_UNAME=$(KVERS) HEADER_DIR=$(KSRC)/include -C vmmon-only auto-build + $(MAKE) VM_UNAME=$(KVERS) HEADER_DIR=$(KSRC)/include -C vmnet-only auto-build + +install: build dinstall +dinstall: + install -d $(DESTDIR)$(MODPREF) + install -m 644 vmmon.* vmnet.* $(DESTDIR)$(MODPREF) + +clean: + rm -rf *.{o,ko} vmmon-only/*.{o,ko} vmnet-only/*.{o,ko} + $(MAKE) VM_UNAME=$(KVERS) clean -C vmmon-only + $(MAKE) VM_UNAME=$(KVERS) clean -C vmnet-only + --- vmware-source-update115.orig/debian/TODO +++ vmware-source-update115/debian/TODO @@ -0,0 +1,3 @@ +Try to make modules Makefile smarter, and spot any missing .config options +(Also document which options are required with VMware. Does framebuffer +still crash?) --- vmware-source-update115.orig/debian/control +++ vmware-source-update115/debian/control @@ -0,0 +1,25 @@ +Source: vmware-source +Section: non-free/otherosfs +Priority: extra +Maintainer: Frédéric Brière +Build-Depends: cdbs (>= 0.4.4), debhelper (>= 5), bzip2 +Standards-Version: 3.7.2 +Vcs-Git: http://git.fbriere.net/debian/vmware-source.git +Vcs-Browser: http://git.debian.org/debian/vmware-source.git/ + +Package: vmware-source +Architecture: all +Depends: module-assistant, cdbs (>= 0.4.4), debhelper (>= 5), make, bzip2, quilt +Recommends: linux-headers | linux-source +Description: Intel x86-based virtual machine - modules source + VMware Workstation is an execution environment for operating systems + running on Intel x86-based hardware. It gives an OS the illusion of + running on standard PC hardware, but it isolates it from the real + hardware and from other activities of the host OS. Thus multiple OSes + may run simultaneously on the same machine: one of them (the host OS) + on the real hardware, the others (the guest OSes) inside vmware. + . + This package contains the source for kernel modules that are necessary + to run VMware Workstation. The kernel sources must be installed to + compile these modules. + --- vmware-source-update115.orig/debian/changelog +++ vmware-source-update115/debian/changelog @@ -0,0 +1,117 @@ +vmware-source (update115-1~fbriere.3) unstable; urgency=low + + * Added 2.6.26 patches, stolen from Gentoo -- thanks guys! + * Switched to CDBS + * Switched to quilt, and moved all patches to vmware-source + * Upgraded debhelper compat level to 5 + * Depend on make, and Recommend linux-headers/source + * Added X-Vcs fields + + -- Frédéric Brière Wed, 24 Sep 2008 19:58:28 -0400 + +vmware-source (update115-1~fbriere.2) unstable; urgency=low + + * Incorporated patches taken from various "update116" and "update117" + floating out there, fixing compatibility problems with 2.6.25. + + -- Frédéric Brière Mon, 23 Jun 2008 16:20:51 -0400 + +vmware-source (update115-1~fbriere.1) unstable; urgency=low + + * New upstream release + + -- Frédéric Brière Mon, 23 Jun 2008 12:18:15 -0400 + +vmware-source (update113-1~fbriere.1) unstable; urgency=low + + * New upstream release + + -- Frédéric Brière Mon, 30 Jul 2007 01:06:01 -0400 + +vmware-source (update112-1) unstable; urgency=low + + * New upstream release + * Fixed debian/watch to point to new upstream location + + -- Frédéric Brière Sun, 29 Jul 2007 01:43:43 -0400 + +vmware-source (update109-1~fbriere.5) unstable; urgency=low + + * Added debian/watch file + + -- Frédéric Brière Sun, 29 Jul 2007 00:59:39 -0400 + +vmware-source (update109-1~fbriere.4) unstable; urgency=low + + * Removed our own postinst/rm scripts, letting dh_installmodules do its job + + -- Frédéric Brière Fri, 29 Jun 2007 00:00:07 -0400 + +vmware-source (update109-1~fbriere.3) unstable; urgency=low + + * Fixed a few fields in the control file + * Fixed debian-rules-ignores-make-clean-error lintian warning + + -- Frédéric Brière Thu, 28 Jun 2007 18:17:14 -0400 + +vmware-source (update109-1~fbriere.2) unstable; urgency=low + + * Corrected the module-assistant instructions in README.Debian + * Removed dependencies on make, gcc and g++ + * Removed README.Debian.ex from tarball + + -- Frédéric Brière Mon, 16 Apr 2007 17:14:59 -0400 + +vmware-source (update109-1~fbriere.1) unstable; urgency=low + + * New upstream release + * Ditched most of README.Debian in favor of module-assistant + + -- Frédéric Brière Mon, 16 Apr 2007 15:10:49 -0400 + +vmware-source (update104-1~fbriere.1) unstable; urgency=low + + * New upstream release + * Force VMWARE_VER to VME_V452 (for the moment) + + -- Frédéric Brière Wed, 23 Aug 2006 01:53:45 -0400 + +vmware-source (update101-0fbriere.1) unstable; urgency=low + + * New upstream release + + -- Frederic Briere Fri, 9 Jun 2006 11:21:38 -0400 + +vmware-source (update99-0fbriere.1) unstable; urgency=low + + * New upstream release + + -- Frederic Briere Fri, 31 Mar 2006 12:53:16 -0500 + +vmware-source (update96-0fbriere.2) unstable; urgency=low + + * Added prep-deb-files as dependency to binary-modules rule to make it + work again + + -- Frederic Briere Mon, 12 Dec 2005 13:13:46 -0500 + +vmware-source (update96-0fbriere.1) unstable; urgency=low + + * New upstream release + * Moved modules-related item from vmware's TODO + + -- Frederic Briere Sun, 4 Dec 2005 19:26:59 -0500 + +vmware-source (update94-0fbriere.1) unstable; urgency=low + + * New upstream release + + -- Frederic Briere Sat, 5 Nov 2005 09:59:07 -0500 + +vmware-source (update93-0fbriere.1) unstable; urgency=low + + * Moved the kernel modules source out of the vmware package + * Very tentative module-assistant support -- feedback is welcome + + -- Frederic Briere Tue, 13 Sep 2005 20:45:33 -0400 + --- vmware-source-update115.orig/debian/rules.modules +++ vmware-source-update115/debian/rules.modules @@ -0,0 +1,89 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. +# +# This version is for a hypothetical package that can build a kernel modules +# architecture-dependant package via make-kpkg, as well as an +# architecture-independent module source package, and other packages +# either dep/indep for things like common files or userspace components +# needed for the kernel modules. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + +include /usr/share/cdbs/1/rules/patchsys-quilt.mk + + +### KERNEL SETUP +### Setup the stuff needed for making kernel module packages +### taken from /usr/share/kernel-package/sample.module.rules + +# prefix of the target package name +PACKAGE=vmware-modules +# modifieable for experiments or debugging m-a +MA_DIR ?= /usr/share/modass +# load generic variable handling +-include $(MA_DIR)/include/generic.make +# load default rules, including kdist, kdist_image, ... +-include $(MA_DIR)/include/common-rules.make + +# module assistant calculates all needed things for us and sets +# following variables: +# KSRC (kernel source directory), KVERS (kernel version string), KDREV +# (revision of the Debian kernel-image package), CC (the correct +# compiler), VERSION (the final package version string), PKGNAME (full +# package name with KVERS included), DEB_DESTDIR (path to store DEBs) + +# The kdist_configure target is called by make-kpkg modules_config and +# by kdist* rules by dependency. It should configure the module so it is +# ready for compilation (mostly useful for calling configure). +# prep-deb-files from module-assistant creates the neccessary debian/ files +kdist_config: prep-deb-files apply-patches + +# the kdist_clean target is called by make-kpkg modules_clean and from +# kdist* rules. It is responsible for cleaning up any changes that have +# been made by the other kdist_commands (except for the .deb files created) +kdist_clean: prep-deb-files reverse-patches + dh_testdir + dh_testroot + + $(MAKE) KSRC=$(KSRC) clean + + dh_clean + +### end KERNEL SETUP + +#k = $(shell echo $(KVERS) | grep -q ^2.6 && echo k) + +# the binary-modules rule is invoked by module-assistant while processing the +# kdist* targets. It is called by module-assistant or make-kpkg and *not* +# during a normal build +binary-modules: + dh_testroot + dh_clean -k + dh_installdirs lib/modules/$(KVERS)/misc + + # Build the module + #$(MAKE) -C drivers KERNEL_DIR=$(KSRC) KVERS=$(KVERS) + $(MAKE) KSRC=$(KSRC) KVERS=$(KVERS) VMWARE_VER=VME_V452 + + # Install the module + $(MAKE) dinstall KSRC=$(KSRC) DESTDIR=$(CURDIR)/debian/$(PKGNAME) + + dh_installmodules + dh_installdocs + dh_installchangelogs Changelog + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol -- -v$(VERSION) + dh_md5sums + dh_builddeb --destdir=$(DEB_DESTDIR) + dh_clean -k + +.PHONY: binary-modules kdist kdist_config kdist_image kdist_clean --- vmware-source-update115.orig/debian/copyright +++ vmware-source-update115/debian/copyright @@ -0,0 +1,804 @@ +This package was debianized by Frederic Briere on +Tue, 13 Sep 2005 19:46:49 -0400 + +It was downloaded from . + +Upstream Author: VMware, Inc. + +Copyright: + +END USER LICENSE AGREEMENT +FOR VMWARE (R) DESKTOP SOFTWARE PRODUCT +March 4, 2004 + +VMWARE, INC. LICENSES THIS DESKTOP SOFTWARE PRODUCT TO YOU SUBJECT +TO THE TERMS CONTAINED IN THIS END USER LICENSE AGREEMENT +("EULA"). READ THE TERMS OF THIS EULA CAREFULLY. BY INSTALLING, +COPYING OR OTHERWISE USING THE SOFTWARE (AS DEFINED BELOW), YOU +AGREE TO BE BOUND BY THE TERMS OF THIS EULA. IF YOU DO NOT AGREE +WITH THE TERMS OF THIS EULA, DO NOT INSTALL, COPY OR USE THE +SOFTWARE AND IF YOU HAVE PROOF OF PAYMENT, YOU MAY RETURN THE +UNOPENED SOFTWARE TO THE LOCATION AT WHICH YOU ACQUIRED IT WITHIN +THIRTY (30) DAYS FOR A REFUND OF THE LICENSE FEE. + +NOTICE TO CUSTOMER +This EULA is a contract between you (either an individual or an +entity) and VMware, Inc. ("VMware"), which governs your use of the +VMware software product that accompanies this EULA and related +software components, which may include associated media, printed +materials, and online or electronic documentation. This VMware +software product is designed for installation and use on a +personal computer only. You may not install or use this VMware +software product on a server. + +DEFINITIONS +This Desktop software package includes a Desktop software product +(the "VMware Desktop Software") and Open Source Software +components. In this EULA, the VMware Desktop Software and +associated media, printed materials, and online or electronic +documentation are collectively referred to as the "Software." The +VMware Desktop Software enables you to run one or more instances +of third-party operating systems ("Guest Operating Systems") and +applications on a single personal computer. A serial number +("Software License Key") issued to you by VMware is required to +use the Software. The term "Number of Licensed Users" means the +number one (1), unless you received a VMware License Certificate +with this software product, in which case the term "Number of +Licensed Users" means the Number of Licensed Users set forth on +the VMware License Certificate. + +"Open Source Software" means various open source software +components, including, without limitation, Samba, DHCP Server, +Tcl/Tk, XFree86, Libresolv, zlib, libpng, OpenSSL and Advanced +Encryption Standard (AES) licensed under the terms of applicable +open source license agreements included in the materials relating +to such software. Some Open Source Software components are +provided with the version of the Software than runs on a Linux +host operating system, some Open Source Software components are +provided with the version of the Software that runs on a Windows +host operating system, and some Open Source Software components +are provided with both such versions of the Software. + +WARNING FOR EVALUATION LICENSEES +The Software can be activated with a no-cost evaluation Software +License Key. Evaluation Software License Keys have an expiration +date ("Expiration Date"). If you activate the Software with an +evaluation Software License Key: (i) you may use the Software +until the Expiration Date only to evaluate the suitability of the +Software for licensing on a for-fee basis; (ii) the limited 90-day +warranty below is not applicable to you; (iii) the limited web- +based support services are not applicable to you; (iv) the +provision of Updates for a period of eighteen (18) months from the +date of shipment of the Software is not applicable to you; and (v) +THE SOFTWARE IS PROVIDED TO YOU "AS IS" WITHOUT WARRANTY OF ANY +KIND, WHETHER EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE. VMWARE +BEARS NO LIABILITY FOR ANY DAMAGES RESULTING FROM USE (OR +ATTEMPTED USE) OF THE SOFTWARE THROUGH OR AFTER THE EXPIRATION +DATE, AND HAS NO DUTY TO PROVIDE SUPPORT OR SOFTWARE UPDATES TO +YOU. + +OPEN SOURCE SOFTWARE +The Open Source Software is composed of individual software +components, each of which has its own copyright and its own +applicable license conditions. You must review the licenses +within the individual packages to understand your rights under +them. The licenses can be found in the open_source_licenses.txt +file, other materials accompanying the software package, the +documentation or corresponding source files available at +http://www.vmware.com/download/open_sources.html. Copyrights to +the Open Source Software are held by the copyright holders +indicated in the copyright notices in the corresponding source +files or in the open_sources_licenses.txt file or other materials +accompanying the software package. + +LICENSE +The Software is licensed, not sold. Subject to the terms and +limitations of this EULA, VMware hereby grants you a nonexclusive, +nontransferable license, without rights to sublicense, to (i) make +a number of copies of the Software less than or equal to the +Number of Licensed Users for the purpose of installing a single +copy of the Software on an equivalent number of personal +computers, each of which is running a validly licensed copy of the +operating system for which the Software is designed; (ii) use the +Software License Key to activate each copy of the Software made in +accordance with sub-clause (i); (iii) have up to the Number of +Licensed Users use the Software (in object code form only) solely +for your own internal information processing services and +computing needs; and (iv) use the documentation accompanying the +Software in connection with permitted uses of the Software. If +you are an entity, each copy of the Software may be used by one +designated individual user only. The total number of designated +users may not exceed the Number of Licensed Users. Each copy of +the Software may not be used by any other person, whether or not +such person is employed by or otherwise associated with your +entity. + +LIMITED SHARED USE LICENSE +For shared use computing laboratory environments within academic +institutions, the license grant above shall be modified to permit +use of the Software on a single personal computer without the +limitation that such use be limited to the designated user(s); +provided that any such user(s) agree to and abide by the terms of +this EULA; provided further that you must acquire and dedicate a +Software License Key for each separate personal computer on which +the Software is installed. Under this shared computing laboratory +use license, a computing laboratory at an academic institution +having ten personal computers loaded with the Software on which no +more than five users would concurrently access and use the +Software, for example, would require ten Software License Keys. +Unless the computing laboratory is operated and maintained by and +within an academic institution, this limited shared use license +does not apply. + +LICENSE LIMITATIONS +You may not copy the Software except for a reasonable number of +machine-readable copies of the Software for backup or archival +purposes and except as expressly permitted in the License section +above. You may not share or use concurrently the Software except +as expressly permitted in the Limited Shared Use License section +above. You may not remove any titles, trademarks or trade names, +copyright notices, legends, or other proprietary markings on the +Software. You are not granted any rights to any trademarks or +service marks of VMware. VMware retains all rights not expressly +granted to you. + +LICENSE AS UPGRADE OF PREVIOUSLY LICENSED PRODUCT +If you purchased this Desktop software product as an upgrade at +the applicable upgrade price, then you must have previously +purchased a prior version of this Desktop software product at the +applicable product (not upgrade) price. If you have not purchased +a prior version at the applicable product price, then please +contact the vendor from whom you purchased the upgrade, or, if you +are unable to contact your vendor, contact VMware, to make payment +for the difference between the upgrade price and the product price +within thirty (30) days of the date you purchased the upgrade. If +you do not make the appropriate payment to your vendor or VMware +within thirty (30) days, this EULA will automatically terminate +and you must comply with the termination provisions below. + +LICENSES REQUIRED FOR THIRD-PARTY SOFTWARE +The Software allows multiple Guest Operating Systems and +applications to run on a single personal computer. You are +responsible for obtaining any licenses necessary to operate any +such third-party software, including Guest Operating Systems. + +PROPRIETARY RIGHTS RESERVED BY VMWARE +VMware retains all right, title, and interest in and to the +Software and the Software License Key and in all related +copyrights, trade secrets, patents, trademarks, and any other +intellectual and industrial property and proprietary rights, +including registrations, applications, renewals, and extensions of +such rights. + +RESTRICTIONS +You may not (i) sell, lease, license, sublicense, distribute or +otherwise transfer in whole or in part the Software or the +Software License Key to another party; (ii) provide, disclose, +divulge or make available to, or permit use of the Software in +whole or in part by, any third party without VMware's prior +written consent; (iii) modify or create derivative works based +upon the Software; or (iv) use the Software to provide network, +application hosting or other services to third parties, or +otherwise use the Software on a service bureau or hosting basis +for your customers. Except to the extent expressly permitted by +applicable law, and to the extent that VMware is not permitted by +that applicable law to exclude or limit the following rights, you +may not decompile, disassemble, reverse engineer, or otherwise +attempt to derive source code from the Software, in whole or in +part. You may not disclose the results of any benchmark test of +the Software to any third party without VMware's prior written +approval. + +LIMITED SUPPORT AND SUBSCRIPTION SERVICES +VMware may provide limited web-based support services related to +the Software for a period of thirty (30) days after the date of +purchase. Upon expiration of such 30-day period, VMware will not +provide any support services under this EULA. For a period of +eighteen (18) months from the date of shipment of the Software, +VMware will provide you with Update Service, as defined in the +VMware Premium Support Programs and Subscription Services -- Terms +and Conditions posted on VMware's Web site at +http://www.vmware.com/support/using/premium.html ("Service +Terms"), free of charge. By accepting the terms of this EULA you +are accepting the Service Terms. Upon expiration of such 18-month +period, VMware will no longer provide you with any Update Service +under this EULA. Thereafter, you may renew the Update Service for +a fee in accordance with the Service Terms. Notwithstanding the +foregoing, if you acquired the Software as an Update (as defined +in the Service Terms) or as part of the Update Service in +connection with a prior purchase of the Software, then you are not +entitled to receive any Update Service or any other support or +subscription services under this EULA. In either case, you also +may purchase support and subscription services separately. If you +have purchased VMware support and subscription services with the +Software, these services are provided to you under the Service +Terms. Unless otherwise provided to you under a separate +agreement, any supplemental software code or related materials +that VMware provides to you as part of any Update Service or +support and subscription services are to be considered part of the +Software and are subject to the terms and conditions of this EULA. +VMware may use any technical information you provide to VMware for +any VMware business purposes without restriction, including for +product support and development. VMware will not use information +in a form that personally identifies you. + +TERMINATION +VMware may terminate this EULA if you fail to comply with any term +of this EULA. In the event of termination, you must destroy all +copies of the Software and Software License Key. In addition you +must remove all copies of the Software from the personal +computer(s) on which it is installed. + +GOVERNMENT RESTRICTIONS +You may not export or re-export the Software except in compliance +with the United States Export Administration Act and the related +rules and regulations and similar non-U.S. government +restrictions, if applicable. The Software and accompanying +documentation are deemed to be "commercial computer software" and +"commercial computer software documentation," respectively, +pursuant to DFAR Section 227.7202 and FAR Section 12.212(b), as +applicable. Any use, modification, reproduction, release, +performing, displaying, or disclosing of the Software by the U.S. +Government shall be governed solely by the terms of this EULA. + +LIMITED WARRANTY +VMware warrants that the media, if any, on which the Software is +delivered will be free of defects and that the Software will +substantially conform to the description contained in the +applicable end user documentation, in each case for a period of 90 +days after the date of shipment of the Software License Key. +EXCEPT FOR THE PRECEDING EXPRESS LIMITED WARRANTY, TO THE MAXIMUM +EXTENT PERMITTED BY APPLICABLE LAW, VMWARE PROVIDES THE SOFTWARE +WITHOUT ANY WARRANTIES OF ANY KIND, EXPRESS, IMPLIED, STATUTORY, +OR IN ANY OTHER PROVISION OF THIS EULA OR COMMUNICATION WITH YOU, +AND VMWARE SPECIFICALLY DISCLAIMS ANY IMPLIED WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON- +INFRINGEMENT. + +LIMITATION OF LIABILITY +TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT +WILL VMWARE BE LIABLE FOR ANY LOST PROFITS OR BUSINESS +OPPORTUNITIES, LOSS OF USE, BUSINESS INTERRUPTION, LOSS OF DATA, +OR ANY OTHER INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES UNDER ANY THEORY OF LIABILITY, WHETHER BASED IN CONTRACT, +TORT, NEGLIGENCE, PRODUCT LIABILITY, OR OTHERWISE. BECAUSE SOME +JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF +LIABILITY FOR CONSEQUENTIAL OR INCIDENTAL DAMAGES, THE PRECEDING +LIMITATION MAY NOT APPLY TO YOU. + +VMWARE'S LIABILITY UNDER THIS EULA WILL NOT, IN ANY EVENT, EXCEED +THE LICENSE FEES, IF ANY, PAID BY YOU TO VMWARE FOR THE SOFTWARE +LICENSED BY YOU UNDER THIS EULA. + +THE FOREGOING LIMITATIONS SHALL APPLY TO THE MAXIMUM EXTENT +PERMITTED BY APPLICABLE LAW, REGARDLESS OF WHETHER VMWARE HAS BEEN +ADVISED OF THE POSSIBILITY OF SUCH DAMAGES AND REGARDLESS OF +WHETHER ANY REMEDY FAILS OF ITS ESSENTIAL PURPOSE. + +GENERAL +This EULA is governed by the laws of the State of California and +the United States of America, without regard to conflict of law +principles. The United Nations Convention for the International +Sale of Goods shall not apply. This EULA is the entire agreement +between us and supersedes the terms of any purchase orders and any +other communications or advertising with respect to the Software. +If any provision of this EULA is held invalid, the remainder of +this EULA shall continue in full force and effect. This EULA may +be modified only by written agreement signed by authorized +representatives of you and VMware. + +CONTACT INFORMATION +If you have any questions about this EULA, or if you want to +contact VMware for any reason, please direct all correspondence +to: VMware, Inc., 3145 Porter Drive, Palo Alto, CA 94304, United +States of America or email info@vmware.com. + +VMware (R) is a registered trademark of VMware, Inc. + + + +======================================================================= + +The following is applicable to Samba as installed by +VMware Workstation (for Linux). + + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; version 2 dated June, 1991. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + 02111-1307, USA. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + + + +======================================================================= + +The following is applicable to the ISC DHCP Server. + +DHCP Copyright +Following is the copyright on the ISC DHCP Server: + +-------------------------------------------------------------------------------- + +Copyright (c) 1995, 1996, 1997, 1998, 1999 +The Internet Software Consortium - DHCP. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following +conditions are met: + +Redistributions of source code must retain the above copyright notice, +this list of conditions and the following disclaimer. +Redistributions in binary form must reproduce the above copyright +notice, this list of conditions and the following disclaimer in +the documentation and/or other materials provided with the distribution. +Neither the name of The Internet Software Consortium - DHCP nor +the names of its contributors may be used to endorse or promote +products derived from this software without specific prior +written permission. + +-------------------------------------------------------------------------------- +THIS SOFTWARE IS PROVIDED BY THE INTERNET SOFTWARE CONSORTIUM +AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE INTERNET SOFTWARE CONSORTIUM OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, +OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING +IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF +THE POSSIBILITY OF SUCH DAMAGE. + + + +======================================================================= + +The following is applicable to zlib.h. + +/* zlib.h -- interface of the 'zlib' general purpose compression library + version 1.1.4, March 11th, 2002 + + Copyright (C) 1995-2002 Jean-loup Gailly and Mark Adler + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + + Jean-loup Gailly jloup@gzip.org + Mark Adler madler@alumni.caltech.edu + +*/ + + + +======================================================================= + +The following is applicable to libpng. + +libpng License + +This copy of the libpng notices is provided for your convenience. In case of +any discrepancy between this copy and the notices in the file png.h that is +included in the libpng distribution, the latter shall prevail. + +COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: + +If you modify libpng you may insert additional notices immediately following +this sentence. + +libpng versions 1.0.7, July 1, 2000, through 1.2.3, May 21, 2002, are +Copyright (c) 2000-2002 Glenn Randers-Pehrson +and are distributed according to the same disclaimer and license as libpng-1.0.6 +with the following individuals added to the list of Contributing Authors + + Simon-Pierre Cadieux + Eric S. Raymond + Gilles Vollant + +and with the following additions to the disclaimer: + + There is no warranty against interference with your enjoyment of the + library or against infringement. There is no warranty that our + efforts or the library will fulfill any of your particular purposes + or needs. This library is provided with all faults, and the entire + risk of satisfactory quality, performance, accuracy, and effort is with + the user. + +libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are +Copyright (c) 1998, 1999 Glenn Randers-Pehrson, and are +distributed according to the same disclaimer and license as libpng-0.96, +with the following individuals added to the list of Contributing Authors: + + Tom Lane + Glenn Randers-Pehrson + Willem van Schaik + +libpng versions 0.89, June 1996, through 0.96, May 1997, are +Copyright (c) 1996, 1997 Andreas Dilger +Distributed according to the same disclaimer and license as libpng-0.88, +with the following individuals added to the list of Contributing Authors: + + John Bowler + Kevin Bracey + Sam Bushell + Magnus Holmgren + Greg Roelofs + Tom Tanner + +libpng versions 0.5, May 1995, through 0.88, January 1996, are +Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc. + +For the purposes of this copyright and license, "Contributing Authors" +is defined as the following set of individuals: + + Andreas Dilger + Dave Martindale + Guy Eric Schalnat + Paul Schmidt + Tim Wegner + +The PNG Reference Library is supplied "AS IS". The Contributing Authors +and Group 42, Inc. disclaim all warranties, expressed or implied, +including, without limitation, the warranties of merchantability and of +fitness for any purpose. The Contributing Authors and Group 42, Inc. +assume no liability for direct, indirect, incidental, special, exemplary, +or consequential damages, which may result from the use of the PNG +Reference Library, even if advised of the possibility of such damage. + +Permission is hereby granted to use, copy, modify, and distribute this +source code, or portions hereof, for any purpose, without fee, subject +to the following restrictions: + +1. The origin of this source code must not be misrepresented. + +2. Altered versions must be plainly marked as such and must not + be misrepresented as being the original source. + +3. This Copyright notice may not be removed or altered from any + source or altered source distribution. + +The Contributing Authors and Group 42, Inc. specifically permit, without +fee, and encourage the use of this source code as a component to +supporting the PNG file format in commercial products. If you use this +source code in a product, acknowledgment is not required but would be +appreciated. + + +A "png_get_copyright" function is available, for convenient use in "about" +boxes and the like: + + printf("%s",png_get_copyright(NULL)); + +Also, the PNG logo (in PNG format, of course) is supplied in the +files "pngbar.png" and "pngbar.jpg (88x31) and "pngnow.png" (98x31). + +Libpng is OSI Certified Open Source Software. OSI Certified Open Source is a +certification mark of the Open Source Initiative. + +Glenn Randers-Pehrson +randeg@alum.rpi.edu +May 21, 2002 + + + +======================================================================= + +The following is applicable to TCL/TK. + +TCL/TK LICENSE TERMS + +This software is copyrighted by the Regents of the University +of California, Sun Microsystems, Inc., Scriptics Corporation, +and other parties. The following terms apply to all files +associated with the software unless explicitly disclaimed +in individual files. + +The authors hereby grant permission to use, copy, modify, distribute, +and license this software and its documentation for any purpose, +provided that existing copyright notices are retained in all copies +and that this notice is included verbatim in any distributions. No +written agreement, license, or royalty fee is required for any of +the authorized uses. Modifications to this software may be +copyrighted by their authors and need not follow the licensing +terms described here, provided that the new terms are clearly +indicated on the first page of each file where they apply. + +IN NO EVENT SHALL THE AUTHORS OR DISTRIBUTORS BE LIABLE TO ANY +PARTY FOR DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES ARISING OUT OF THE USE OF THIS SOFTWARE, ITS DOCUMENTATION, +OR ANY DERIVATIVES THEREOF, EVEN IF THE AUTHORS HAVE BEEN ADVISED +OF THE POSSIBILITY OF SUCH DAMAGE. + +THE AUTHORS AND DISTRIBUTORS SPECIFICALLY DISCLAIM ANY WARRANTIES, +INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND +NON-INFRINGEMENT. THIS SOFTWARE IS PROVIDED ON AN "AS IS" +BASIS, AND THE AUTHORS AND DISTRIBUTORS HAVE NO OBLIGATION +TO PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR +MODIFICATIONS. + +GOVERNMENT USE: If you are acquiring this software on behalf of +the U.S. government, the Government shall have only "Restricted +Rights" in the software and related documentation as defined in +the Federal Acquisition Regulations (FARs) in +Clause 52.227.19 (c) (2). If you are acquiring the software +on behalf of the Department of Defense, the software shall be +classified as "Commercial Computer Software" and the Government +shall have only "Restricted Rights" as defined in +Clause 252.227-7013 (c) (1) of DFARs. Notwithstanding the foregoing, +the authors grant the U.S. Government and others acting in its behalf +permission to use and distribute the software in accordance with +the terms specified in this license. + + + +======================================================================= + +The following is applicable to XFree86. + +Copyright c 1996 X Consortium + +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, dis- +tribute, sublicense, and/or sell copies of the Software, and to permit +persons to whom the Software is furnished to do so, subject to the fol- +lowing 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 MERCHANTABIL- +ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT +SHALL THE X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABIL- +ITY, 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. + +Except as contained in this notice, the name of the X Consortium shall +not be used in advertising or otherwise to promote the sale, use or +other dealings in this Software without prior written authorization from +the X Consortium. + +X Window System is a trademark of X Consortium, Inc. + + + +====================================================================== + +The following is applicable to Libresolv. + +/* + * Copyright (c) 1983, 1987, 1989 + * The Regents of the University of California. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 4. Neither the name of the University nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANYWAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + + +/* + * Portions Copyright (c) 1996-1999 by Internet Software Consortium. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS + * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE + * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS + * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS + * SOFTWARE. + */ + + + +======================================================================= + +The following is applicable to the OpenSSL Toolkit. +This product includes software developed by the Open SSL Project +for use in the OpenSSL Toolkit (http://www.openssl.org/). +Eric Young is the author of portions of the SSLeay library used. +This product includes software written by Tim Hudson (tjh@cryptsoft.com). + + OpenSSL License + --------------- + +/* ==================================================================== + * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * 3. All advertising materials mentioning features or use of this + * software must display the following acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" + * + * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to + * endorse or promote products derived from this software without + * prior written permission. For written permission, please contact + * openssl-core@openssl.org. + * + * 5. Products derived from this software may not be called "OpenSSL" + * nor may "OpenSSL" appear in their names without prior written + * permission of the OpenSSL Project. + * + * 6. Redistributions of any form whatsoever must retain the following + * acknowledgment: + * "This product includes software developed by the OpenSSL Project + * for use in the OpenSSL Toolkit (http://www.openssl.org/)" + * + * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY + * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR + * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. + * ==================================================================== + * + */ + + Original SSLeay License + ----------------------- + +/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) + * All rights reserved. + * + * This package is an SSL implementation written + * by Eric Young (eay@cryptsoft.com). + * The implementation was written so as to conform with Netscapes SSL. + * + * This library is free for commercial and non-commercial use as long as + * the following conditions are aheared to. The following conditions + * apply to all code found in this distribution, be it the RC4, RSA, + * lhash, DES, etc., code; not just the SSL code. The SSL documentation + * included with this distribution is covered by the same copyright terms + * except that the holder is Tim Hudson (tjh@cryptsoft.com). + * + * Copyright remains Eric Young's, and as such any Copyright notices in + * the code are not to be removed. + * If this package is used in a product, Eric Young should be given attribution + * as the author of the parts of the library used. + * This can be in the form of a textual message at program startup or + * in documentation (online or textual) provided with the package. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * "This product includes cryptographic software written by + * Eric Young (eay@cryptsoft.com)" + * The word 'cryptographic' can be left out if the rouines from the library + * being used are not cryptographic related :-). + * 4. If you include any Windows specific code (or a derivative thereof) from + * the apps directory (application code) you must include an acknowledgement: + * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)" + * + * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * The licence and distribution terms for any publically available version or + * derivative of this code cannot be changed. i.e. this code cannot simply be + * copied and put under another distribution licence + * [including the GNU Public Licence.] + */ + + + +======================================================================= + +The following is applicable to Advanced Encryption Standard (AES). + +Copyright (c) 2003, Dr Brian Gladman , +Worcester, UK. All rights reserved. + +LICENSE TERMS + +The free distribution and use of this software in both +source and binary +form is allowed (with or without changes) provided that: + + 1. distributions of this source code include the above copyright + notice, this list of conditions and the following disclaimer; + + 2. distributions in binary form include the above copyright + notice, this list of conditions and the following disclaimer + in the documentation and/or other associated materials; + + 3. the copyright holder's name is not used to endorse products + built using this software without specific written permission. + +ALTERNATIVELY, provided that this notice is retained in +full, this product may be distributed under the terms of the +GNU General Public License (GPL),in which case the provisions of +the GPL apply INSTEAD OF those given above. + +DISCLAIMER + +This software is provided 'as is' with no explicit or implied +warranties in respect of its properties, including, but not +limited to, correctness and/or fitness for purpose. + --- vmware-source-update115.orig/debian/README.Debian +++ vmware-source-update115/debian/README.Debian @@ -0,0 +1,31 @@ +vmware-source for Debian +------------------------ + +This package provides the source code of the kernel modules that are needed +to run VMware Workstation (and other VMware applications). These modules +need to be compiled for the exact version of the Linux kernel running on your +computer. + +(There used to be several ways to do this, all of which have been deprecated +in favor of module-assistant.) + + +If you are running a stock Debian kernel (ie. you installed one of the +linux-image-* packages provided by Debian), you only have to run the following +command, as root: + + # module-assistant auto-install vmware-source + + +If you are running a custom kernel (ie. one which you configured and compiled +yourself), you will need a copy of your kernel build tree, fully configured. +You can then invoke module-assistant, telling it the location of the build +tree: + + # module-assistant -k build-install vmware-source + + +In either case, refer to the module-assistant manpage for more details. + + + -- Frederic Briere , Mon, 16 Apr 2007 15:05:20 -0400 --- vmware-source-update115.orig/debian/watch +++ vmware-source-update115/debian/watch @@ -0,0 +1,3 @@ +version=3 + +http://platan.vc.cvut.cz/ftp/pub/vmware/vmware-any-any-(update\d+).tar.gz --- vmware-source-update115.orig/debian/patches/nopage.patch +++ vmware-source-update115/debian/patches/nopage.patch @@ -0,0 +1,162 @@ +--- a/vmmon-only/linux/driver.c ++++ b/vmmon-only/linux/driver.c +@@ -28,6 +28,10 @@ + + #include + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) ++# include ++#endif ++ + #ifdef DO_APM + #include + #endif +@@ -147,7 +151,12 @@ + + static int LinuxDriver_Close(struct inode *inode, struct file *filp); + static unsigned int LinuxDriverPoll(struct file *file, poll_table *wait); +-#if defined(VMW_NOPAGE_261) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) ++static int LinuxDriverNoPage(struct vm_area_struct *vma, ++ struct vm_fault *fdata); ++static int LinuxDriverLockedNoPage(struct vm_area_struct *vma, ++ struct vm_fault *fdata); ++#elif defined(VMW_NOPAGE_261) + static struct page *LinuxDriverNoPage(struct vm_area_struct *vma, + unsigned long address, int *type); + static struct page *LinuxDriverLockedNoPage(struct vm_area_struct *vma, +@@ -168,11 +177,19 @@ + static void LinuxDriverPollTimeout(unsigned long clientData); + + static struct vm_operations_struct vmuser_mops = { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) ++ .fault = LinuxDriverNoPage ++#else + .nopage = LinuxDriverNoPage ++#endif + }; + + struct vm_operations_struct vmuser_locked_mops = { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) ++ .fault = LinuxDriverLockedNoPage ++#else + .nopage = LinuxDriverLockedNoPage ++#endif + }; + + static struct file_operations vmuser_fops; +@@ -1143,7 +1160,10 @@ + *----------------------------------------------------------------------------- + */ + +-#ifdef VMW_NOPAGE_261 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) ++static int LinuxDriverNoPage(struct vm_area_struct *vma, ++ struct vm_fault *fdata) ++#elif defined VMW_NOPAGE_261 + static struct page *LinuxDriverNoPage(struct vm_area_struct *vma, //IN + unsigned long address, //IN + int *type) //OUT: Fault type +@@ -1161,14 +1181,25 @@ + unsigned long pg; + struct page* page; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) ++ pg = fdata->pgoff; ++#else + pg = ((address - vma->vm_start) >> PAGE_SHIFT) + compat_vm_pgoff(vma); ++#endif + pg = VMMON_MAP_OFFSET(pg); + if (pg >= vmLinux->size4Gb) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) ++ return VM_FAULT_MAJOR; ++#else + return 0; ++#endif + } + page = vmLinux->pages4Gb[pg]; + get_page(page); +-#ifdef KERNEL_2_4_0 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) ++ fdata->page = page; ++ return VM_FAULT_MINOR; ++#elif defined KERNEL_2_4_0 + #ifdef VMW_NOPAGE_261 + *type = VM_FAULT_MINOR; + #endif +--- a/vmmon-only/linux/driver_compat.h ++++ b/vmmon-only/linux/driver_compat.h +@@ -268,7 +268,10 @@ + *----------------------------------------------------------------------------- + */ + +-#ifdef VMW_NOPAGE_261 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) ++static int LinuxDriverLockedNoPage(struct vm_area_struct *vma, ++ struct vm_fault *fdata) ++#elif defined VMW_NOPAGE_261 + static struct page *LinuxDriverLockedNoPage(struct vm_area_struct *vma, //IN + unsigned long address, //IN + int *type) //OUT: Fault type +@@ -288,33 +291,60 @@ + struct VMHostEntry* vmhe; + struct page* result; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) ++ pg = fdata->pgoff; ++#else + pg = ((address - vma->vm_start) >> PAGE_SHIFT) + compat_vm_pgoff(vma); ++#endif + if (pg >= vmLinux->sizeLocked) { + printk(KERN_DEBUG "vmmon: Something went wrong: entry %08lX out of range (>=%08X) for mapping on filp %p\n", pg, vmLinux->sizeLocked, vmLinux); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) ++ return VM_FAULT_SIGBUS; ++#else + return NOPAGE_SIGBUS; ++#endif + } + if (!vmLinux->vm || !vmLinux->vm->vmhost) { + printk(KERN_DEBUG "vmmon: Something went wrong: no vm or vmhost for mapping on filp %p\n", vmLinux); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) ++ return VM_FAULT_SIGBUS; ++#else + return NOPAGE_SIGBUS; ++#endif + } + pgt = vmLinux->pagesLocked->ent[pg / VMHOST_MAPPING_PT]; + if (!pgt) { + printk(KERN_DEBUG "vmmon: Something went wrong: missing entry %08lX from mapping on filp %p\n", pg, vmLinux); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) ++ return VM_FAULT_SIGBUS; ++#else + return NOPAGE_SIGBUS; ++#endif + } + vmhe = kmap(pgt); + result = vmhe->ent[pg % VMHOST_MAPPING_PT]; + kunmap(pgt); + if (!result) { + printk(KERN_DEBUG "vmmon: Something went wrong: attempt to access non-existing entry %08lX in mapping on filp %p\n", pg, vmLinux); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) ++ return VM_FAULT_SIGBUS; ++#else + return NOPAGE_SIGBUS; ++#endif + } + if (!PhysTrack_Test(vmLinux->vm->vmhost->AWEPages, page_to_pfn(result))) { + printk(KERN_DEBUG "vmmon: MPN %08lX not tracked! Someone released it before removing it from VA first!\n", pg); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) ++ return VM_FAULT_SIGBUS; ++#else + return NOPAGE_SIGBUS; ++#endif + } + get_page(result); +-#ifdef KERNEL_2_4_0 ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26) ++ fdata->page = result; ++ return VM_FAULT_MINOR; ++#elif defined KERNEL_2_4_0 + #ifdef VMW_NOPAGE_261 + *type = VM_FAULT_MINOR; + #endif --- vmware-source-update115.orig/debian/patches/vmnet.patch +++ vmware-source-update115/debian/patches/vmnet.patch @@ -0,0 +1,20 @@ +--- a/vmnet-only/Makefile.orig 2004-12-18 14:43:45.000000000 -0500 ++++ b/vmnet-only/Makefile 2005-08-17 13:26:00.000000000 -0400 +@@ -100,7 +100,7 @@ + endif + + auto-build: $(DRIVER_KO) +- cp -f $< $(SRCROOT)/../$(DRIVER).o ++ cp -f $< $(SRCROOT)/../ + + $(DRIVER): $(DRIVER_KO) + cp -f $< $@ +@@ -114,7 +114,7 @@ + MAKEOVERRIDES := $(filter-out CC=%,$(MAKEOVERRIDES)) + + $(DRIVER_KO): +- make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) modules ++ $(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) CC=$(CC) modules + + else + --- vmware-source-update115.orig/debian/patches/series +++ vmware-source-update115/debian/patches/series @@ -0,0 +1,11 @@ +vmmon.patch +vmnet.patch +80211.patch +bitops.patch +nf_inet.patch +sock_valbool.patch +vmmon_version.patch +x86.patch +nopage.patch +dev_net.patch +procfs.patch --- vmware-source-update115.orig/debian/patches/80211.patch +++ vmware-source-update115/debian/patches/80211.patch @@ -0,0 +1,23 @@ +# CONFIG_NET_RADIO has been replaced with CONFIG_WLAN_80211 + +diff -ruN vmnet-only/bridge.c bridge/vmnet-only/bridge.c +--- a/vmnet-only/bridge.c 2007-11-28 05:25:06.000000000 -0500 ++++ b/bridge/vmnet-only/bridge.c 2008-02-26 20:56:22.000000000 -0500 +@@ -32,7 +32,7 @@ + #include + #include + +-#ifdef CONFIG_NET_RADIO ++#if defined CONFIG_NET_RADIO || defined CONFIG_WLAN_80211 + # include + #endif + #include "vmnetInt.h" +@@ -855,7 +855,7 @@ + { + #ifdef CONFIG_WIRELESS_EXT + return dev->wireless_handlers != NULL; +-#elif !defined(CONFIG_NET_RADIO) ++#elif !defined CONFIG_NET_RADIO && !defined CONFIG_WLAN_80211 + return FALSE; + #elif WIRELESS_EXT > 19 + return dev->wireless_handlers != NULL; --- vmware-source-update115.orig/debian/patches/dev_net.patch +++ vmware-source-update115/debian/patches/dev_net.patch @@ -0,0 +1,46 @@ +# Commit c346dca10840a874240c78efe3f39acf4312a1f2 introduced dev_net(), which +# should be used instead of accessing .nd_net directly + +--- a/vmnet-only/bridge.c 2008-05-16 07:59:28.000000000 +0200 ++++ b/vmnet-only/bridge.c 2008-08-07 22:12:50.000000000 +0200 +@@ -275,8 +275,12 @@ + struct net_device *net) // IN: Network device + { + #ifdef VMW_NETDEV_HAS_NET ++# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) + if (net->nd_net != bridge->internalDev->nd_net) { ++# else ++ if (dev_net(net) != dev_net(bridge->internalDev)) { ++# endif + return 0; + } + #endif + return strcmp(net->name, bridge->name) == 0; +--- a/vmnet-only/vmnetInt.h 2008-05-16 07:59:28.000000000 +0200 ++++ b/vmnet-only/vmnetInt.h 2008-08-07 22:20:13.000000000 +0200 +@@ -63,7 +63,11 @@ + # define dev_lock_list() read_lock(&dev_base_lock) + # define dev_unlock_list() read_unlock(&dev_base_lock) + # ifdef VMW_NETDEV_HAS_NET ++# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) + # define DEV_GET(x) __dev_get_by_name((x)->internalDev->nd_net, (x)->name) ++# else ++# define DEV_GET(x) __dev_get_by_name(dev_net((x)->internalDev), (x)->name) ++# endif + # else + # define DEV_GET(x) __dev_get_by_name((x)->name) + # endif +@@ -89,8 +93,13 @@ + + #ifdef VMW_NETDEV_HAS_NET + extern struct proto vmnet_proto; ++# if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) + # define compat_sk_alloc(_bri, _pri) sk_alloc((_bri)->internalDev->nd_net, \ + PF_NETLINK, _pri, &vmnet_proto) ++# else ++# define compat_sk_alloc(_bri, _pri) sk_alloc(dev_net((_bri)->internalDev), \ ++ PF_NETLINK, _pri, &vmnet_proto) ++# endif + #elif defined(VMW_HAVE_SK_ALLOC_WITH_PROTO) + extern struct proto vmnet_proto; + # define compat_sk_alloc(_bri, _pri) sk_alloc(PF_NETLINK, _pri, &vmnet_proto, 1) --- vmware-source-update115.orig/debian/patches/procfs.patch +++ vmware-source-update115/debian/patches/procfs.patch @@ -0,0 +1,26 @@ +--- a/vmnet-only/procfs.c 2008-05-16 07:59:28.000000000 +0200 ++++ b/vmnet-only/procfs.c 2008-08-07 22:15:58.000000000 +0200 +@@ -63,7 +63,11 @@ + { + int retval; + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) + retval = VNetProc_MakeEntry(&proc_root, "vmnet", S_IFDIR, &base); ++#else ++ retval = VNetProc_MakeEntry(NULL, "vmnet", S_IFDIR, &base); ++#endif + if (retval) { + return retval; + } +@@ -95,7 +99,11 @@ + void + VNetProc_Cleanup(void) + { ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) + VNetProc_RemoveEntry(base, &proc_root); ++#else ++ VNetProc_RemoveEntry(base, NULL); ++#endif + base = NULL; + } + --- vmware-source-update115.orig/debian/patches/vmmon.patch +++ vmware-source-update115/debian/patches/vmmon.patch @@ -0,0 +1,20 @@ +--- a/vmmon-only/Makefile.orig 2004-04-10 10:06:59.000000000 -0400 ++++ b/vmmon-only/Makefile 2005-08-17 13:25:42.000000000 -0400 +@@ -100,7 +100,7 @@ + endif + + auto-build: $(DRIVER_KO) +- cp -f $< $(SRCROOT)/../$(DRIVER).o ++ cp -f $< $(SRCROOT)/../ + + $(DRIVER): $(DRIVER_KO) + cp -f $< $@ +@@ -116,7 +116,7 @@ + endif + + $(DRIVER_KO): +- make -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) modules ++ $(MAKE) -C $(BUILD_DIR) SUBDIRS=$$PWD SRCROOT=$$PWD/$(SRCROOT) CC=$(CC) modules + + else + --- vmware-source-update115.orig/debian/patches/x86.patch +++ vmware-source-update115/debian/patches/x86.patch @@ -0,0 +1,14 @@ +# include/asm-i386 was merged into include/asm-x86 + +diff -ruN vmmon-only/common/task.c vmmon-only/common/task.c +--- a/vmmon-only/common/task.c 2007-11-28 05:58:17.000000000 -0500 ++++ b/vmmon-only/common/task.c 2008-05-11 11:15:16.000000000 -0400 +@@ -25,7 +25,8 @@ + * we do not need asm/page.h anymore in this file - not surprising, this + * is common file, yes? And Windows do not have page.h, do they? + */ + #define _I386_PAGE_H ++#define _ASM_X86_PAGE_H + /* On Linux, must come before any inclusion of asm/page.h --hpreg */ + #include "hostKernel.h" + #ifdef linux --- vmware-source-update115.orig/debian/patches/sock_valbool.patch +++ vmware-source-update115/debian/patches/sock_valbool.patch @@ -0,0 +1,23 @@ +# Commit c0ef877b2c9f543e9fb7953bfe1a0cd3a4eae362 turned sock_valbool_flag() +# into a private local function. + +diff -ruN vmnet-only/bridge.c vmnet-only/bridge.c +--- a/vmnet-only/bridge.c 2007-11-28 05:25:06.000000000 -0500 ++++ b/vmnet-only/bridge.c 2008-06-06 16:36:50.000000000 -0400 +@@ -886,6 +886,16 @@ + *---------------------------------------------------------------------- + */ + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25) ++static inline void sock_valbool_flag(struct sock *sk, int bit, int valbool) ++{ ++ if (valbool) ++ sock_set_flag(sk, bit); ++ else ++ sock_reset_flag(sk, bit); ++} ++#endif ++ + int + VNetBridgeUp(VNetBridge *bridge, // IN: bridge struct + Bool rtnlLock) // IN: acquire RTNL lock --- vmware-source-update115.orig/debian/patches/vmmon_version.patch +++ vmware-source-update115/debian/patches/vmmon_version.patch @@ -0,0 +1,27 @@ +# VMware Workstation 6.0.2 appears to expect a more recent module version. +# (It's not clear what changes, if any, should come with this.) + +diff -ruN vmmon-only/include/iocontrols_compat.h vmmon-only/include/iocontrols_compat.h +--- a/vmmon-only/include/iocontrols_compat.h 2007-07-23 05:59:47.000000000 -0400 ++++ b/vmmon-only/include/iocontrols_compat.h 2007-12-31 21:03:48.000000000 -0500 +@@ -15,7 +15,7 @@ + #define VMMON_VERSION_V5 (116 << 16 | 0) + #define VMMON_VERSION_V55 (137 << 16 | 0) + #define VMMON_VERSION_S1B1 (138 << 16 | 0) +-#define VMMON_VERSION_V6 (161 << 16 | 0) ++#define VMMON_VERSION_V6 (167 << 16 | 0) + + /* + * Limit structure for CREATE_VM +diff -ruN vmmon-only/include/iocontrols.h vmmon-only/include/iocontrols.h +--- a/vmmon-only/include/iocontrols.h 2007-11-28 05:48:50.000000000 -0500 ++++ b/vmmon-only/include/iocontrols.h 2007-12-31 21:03:55.000000000 -0500 +@@ -45,7 +45,7 @@ + * + */ + +-#define VMMON_VERSION (161 << 16 | 0) ++#define VMMON_VERSION (167 << 16 | 0) + #define VMMON_VERSION_MAJOR(v) ((uint32) (v) >> 16) + #define VMMON_VERSION_MINOR(v) ((uint16) (v)) + --- vmware-source-update115.orig/debian/patches/nf_inet.patch +++ vmware-source-update115/debian/patches/nf_inet.patch @@ -0,0 +1,19 @@ +# Commit 6e23ae2a48750bda407a4a58f52a4865d7308bf5 replaced NF_IP_* +# with NF_INET_*. + +diff -ruN vmnet-only/filter.c vmnet-only/filter.c +--- a/vmnet-only/filter.c 2007-11-28 05:11:12.000000000 -0500 ++++ b/vmnet-only/filter.c 2008-05-11 11:12:44.000000000 -0400 +@@ -12,6 +12,12 @@ + #include + #include "compat_skbuff.h" + #include ++ ++#ifndef NF_IP_LOCAL_OUT ++#define NF_IP_LOCAL_OUT NF_INET_LOCAL_OUT ++#define NF_IP_LOCAL_IN NF_INET_LOCAL_IN ++#define NF_IP_POST_ROUTING NF_INET_POST_ROUTING ++#endif + /* + * All this makes sense only if NETFILTER support is configured in our kernel. + */ --- vmware-source-update115.orig/debian/patches/bitops.patch +++ vmware-source-update115/debian/patches/bitops.patch @@ -0,0 +1,15 @@ +# Commit 0624517d809b1cf53c977335c9bda4c216cbddee forbids direct inclusion +# of asm/bitops.h + +diff -ruN vmmon-only/include/vcpuset.h vmmon-only/include/vcpuset.h +--- a/vmmon-only/include/vcpuset.h 2007-07-22 07:21:17.000000000 -0400 ++++ b/vmmon-only/include/vcpuset.h 2007-12-31 20:21:52.000000000 -0500 +@@ -71,7 +71,7 @@ + #define ffs(x) ffs_x86_64(x) + + #elif defined MODULE +- #include "asm/bitops.h" ++ #include "linux/bitops.h" + #elif defined __APPLE__ && defined KERNEL + /* + * XXXMACOS An ugly hack to resolve redefinition of PAGE_ defines