diff options
27 files changed, 180 insertions, 288 deletions
diff --git a/app-emulation/vmware-modules/Manifest b/app-emulation/vmware-modules/Manifest index f851bcf..173b62d 100644 --- a/app-emulation/vmware-modules/Manifest +++ b/app-emulation/vmware-modules/Manifest @@ -3,10 +3,10 @@ MD5 b90ff7e76d6c548c562b6bb276ad28ae files/vmware-modules-101-makefile.patch 343 RMD160 d2f63ede9d9dbc6ec94ccede9177a5a15a678e62 files/vmware-modules-101-makefile.patch 343 SHA256 fadf02891dd78611790f6b59c2ba7ec5aaaa9767bbe779d97e6c3b38aaaa7b94 files/vmware-modules-101-makefile.patch 343 DIST vmware-any-any-update101.tar.gz 296409 RMD160 d8994b91492257d8b8e08480ab27fc307fc34095 SHA256 b12e3a70117ef26a85c8e01a23ea7d21b62bbc86998368114f9f7932390d2037 size 296409 -EBUILD vmware-modules-101-r1.ebuild 1370 RMD160 7fe8d6f861f9a25c635e12c49ad5eda3d1180c42 SHA1 601f9f85632a9f4e457d29df4378f62b9704d62e SHA256 3760734ce47a1afbe2a3682cd858d2aa21ff701ff5ef4f84baa2f556dec3866b size 1370 -MD5 be31e71624b8397e93ddc19fb67b78e1 vmware-modules-101-r1.ebuild 1370 -RMD160 7fe8d6f861f9a25c635e12c49ad5eda3d1180c42 vmware-modules-101-r1.ebuild 1370 -SHA256 3760734ce47a1afbe2a3682cd858d2aa21ff701ff5ef4f84baa2f556dec3866b vmware-modules-101-r1.ebuild 1370 -MD5 ba6f4b9f12358a7d5fd4d2aa7a7df366 files/digest-vmware-modules-101-r1 274 -RMD160 dde69d8dc0b4f3d9a670d3a1fcf4dfaf797d8b2c files/digest-vmware-modules-101-r1 274 -SHA256 0709bc0650eae2c2976c42f497ff0d5736bfa00de85d6c8c1c21173e38de5ff1 files/digest-vmware-modules-101-r1 274 +EBUILD vmware-modules-101-r2.ebuild 1601 RMD160 ac8722370caacd4793a51ea0bf8cacc3f404587c SHA1 438996584be53903e2aa1ba443605d2fa457572a SHA256 f1fed3723c0edf1f5c92d008ed83b110d96ca4ec8097177f4c86c6e30cbf16a6 size 1601 +MD5 89c09aaf94af89e69e9d7766b065beaa vmware-modules-101-r2.ebuild 1601 +RMD160 ac8722370caacd4793a51ea0bf8cacc3f404587c vmware-modules-101-r2.ebuild 1601 +SHA256 f1fed3723c0edf1f5c92d008ed83b110d96ca4ec8097177f4c86c6e30cbf16a6 vmware-modules-101-r2.ebuild 1601 +MD5 ba6f4b9f12358a7d5fd4d2aa7a7df366 files/digest-vmware-modules-101-r2 274 +RMD160 dde69d8dc0b4f3d9a670d3a1fcf4dfaf797d8b2c files/digest-vmware-modules-101-r2 274 +SHA256 0709bc0650eae2c2976c42f497ff0d5736bfa00de85d6c8c1c21173e38de5ff1 files/digest-vmware-modules-101-r2 274 diff --git a/app-emulation/vmware-modules/files/digest-vmware-modules-101-r1 b/app-emulation/vmware-modules/files/digest-vmware-modules-101-r2 index 8b694f2..8b694f2 100644 --- a/app-emulation/vmware-modules/files/digest-vmware-modules-101-r1 +++ b/app-emulation/vmware-modules/files/digest-vmware-modules-101-r2 diff --git a/app-emulation/vmware-modules/vmware-modules-101-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-101-r2.ebuild index 7444795..e7115e9 100644 --- a/app-emulation/vmware-modules/vmware-modules-101-r1.ebuild +++ b/app-emulation/vmware-modules/vmware-modules-101-r2.ebuild @@ -19,7 +19,9 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="" -DEPEND=">=sys-apps/portage-2.0.54" +DEPEND="dev-lang/perl + >=sys-apps/portage-2.0.54 + app-emulation/vmware-server" #CONFIG_CHECK="CRYPTO NET_RADIO SYSCTL" #ERROR_CRYPTO="${P} requires Cryptographic API support (CONFIG_CRYPTO)." @@ -49,3 +51,18 @@ src_unpack() { convert_to_m ${S}/${dir}-only/Makefile done } + +src_compile() { + einfo "Determining build version..." + ${S}/vmmon-only/getversion.pl > ${S}/module-build + + linux-mod_src_compile +} + +src_install() { + linux-mod_src_install + insinto /opt/vmware/ + doins ${S}/module-build + + linux-mod_src_install +} diff --git a/app-emulation/vmware-server-console/Manifest b/app-emulation/vmware-server-console/Manifest index 260f38d..5f99879 100644 --- a/app-emulation/vmware-server-console/Manifest +++ b/app-emulation/vmware-server-console/Manifest @@ -1,12 +1,16 @@ -MD5 e422834560595f9a56b6a2036c583b97 files/99vmware-console 76 -RMD160 22fed127d20bfb758163443dcbd2879bf1d49be6 files/99vmware-console 76 -SHA256 ff3abe9d58fd673d8f3d2f7e967aa6db426e3e15b4d868dc1483682357a928b8 files/99vmware-console 76 -MD5 20044d05f014c70b544f249d90d34b62 files/digest-vmware-server-console-1.0.0.22874 313 -RMD160 0863d8d3619946bb0dba171ae7ce51779193a07b files/digest-vmware-server-console-1.0.0.22874 313 -SHA256 9d759b10342ded232cf2cb955a6c2f23da308b4c21d15d65725ba85501e6d6dd files/digest-vmware-server-console-1.0.0.22874 313 +AUX 99vmware-server-console 76 RMD160 22fed127d20bfb758163443dcbd2879bf1d49be6 SHA1 105e3194c134b752a8d5cef1a23ae621cd835d80 SHA256 ff3abe9d58fd673d8f3d2f7e967aa6db426e3e15b4d868dc1483682357a928b8 size 76 +MD5 e422834560595f9a56b6a2036c583b97 files/99vmware-server-console 76 +RMD160 22fed127d20bfb758163443dcbd2879bf1d49be6 files/99vmware-server-console 76 +SHA256 ff3abe9d58fd673d8f3d2f7e967aa6db426e3e15b4d868dc1483682357a928b8 files/99vmware-server-console 76 +AUX vmware.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee7ca0abb8b8793c9f56d858bb08c1c715f SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d size 1592 MD5 aa1b576735134579f04b29763901dc4f files/vmware.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c files/vmware.xml 1592 SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d files/vmware.xml 1592 -MD5 f4b4fb8a9ac98ed3766cf009e10528b1 vmware-server-console-1.0.0.22874.ebuild 5135 -RMD160 6a22ca003388b4fe5d7a27cbda48e4f94ff5f2cc vmware-server-console-1.0.0.22874.ebuild 5135 -SHA256 fbd48f93e96ac433fafc8aa521ab7385ade04ab693a7f2f6deb6d85f833e692c vmware-server-console-1.0.0.22874.ebuild 5135 +DIST VMware-server-linux-client-e.x.p-23869.zip 24680832 RMD160 0bd8cf6acd4924519d44506387eb869ad5b9fd7d SHA256 0d585a3eec68e8ee2d06dc64c9e7613fa12ce5095a5fbaf8f101fd008041687d size 24680832 +EBUILD vmware-server-console-1.0.0.23869.ebuild 4881 RMD160 034106ee25921ac9c626b433131c7c904b715caa SHA1 a33a9d83fbf2d4ccee01c41dc85367740b5479b9 SHA256 428f7d2f94b0e7f33f38855d78b695fff265eba78986a13889dfb85ba58170da size 4881 +MD5 123e3a863ae2d67d0a6588751d9c8a4b vmware-server-console-1.0.0.23869.ebuild 4881 +RMD160 034106ee25921ac9c626b433131c7c904b715caa vmware-server-console-1.0.0.23869.ebuild 4881 +SHA256 428f7d2f94b0e7f33f38855d78b695fff265eba78986a13889dfb85ba58170da vmware-server-console-1.0.0.23869.ebuild 4881 +MD5 322676dcbda83026e3e508ff58d77881 files/digest-vmware-server-console-1.0.0.23869 313 +RMD160 67e422935bcdc78b5eb850bfe47a718a94fa060d files/digest-vmware-server-console-1.0.0.23869 313 +SHA256 08c5a8a2cca094752436696355dc6760a0587ba16c8d3ffa18fb87956f082005 files/digest-vmware-server-console-1.0.0.23869 313 diff --git a/app-emulation/vmware-server-console/files/99vmware-console b/app-emulation/vmware-server-console/files/99vmware-server-console index 847dd8c..847dd8c 100644 --- a/app-emulation/vmware-server-console/files/99vmware-console +++ b/app-emulation/vmware-server-console/files/99vmware-server-console diff --git a/app-emulation/vmware-server-console/files/digest-vmware-server-console-1.0.0.22874 b/app-emulation/vmware-server-console/files/digest-vmware-server-console-1.0.0.22874 deleted file mode 100644 index 11777e9..0000000 --- a/app-emulation/vmware-server-console/files/digest-vmware-server-console-1.0.0.22874 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 63e5e8d689eaaf68da3abd7077ef48e4 VMware-server-linux-client-e.x.p-22874.zip 33781705 -RMD160 3b502888eb91bf33499899da9ca1ed42af5a7fa8 VMware-server-linux-client-e.x.p-22874.zip 33781705 -SHA256 d28608b0dd66ae2015db60e8bba9e1278f3d382183029de8b5850b099399620c VMware-server-linux-client-e.x.p-22874.zip 33781705 diff --git a/app-emulation/vmware-server-console/files/digest-vmware-server-console-1.0.0.23869 b/app-emulation/vmware-server-console/files/digest-vmware-server-console-1.0.0.23869 new file mode 100644 index 0000000..3ece405 --- /dev/null +++ b/app-emulation/vmware-server-console/files/digest-vmware-server-console-1.0.0.23869 @@ -0,0 +1,3 @@ +MD5 0d96ddfa90ede84a7b3632b9681875fc VMware-server-linux-client-e.x.p-23869.zip 24680832 +RMD160 0bd8cf6acd4924519d44506387eb869ad5b9fd7d VMware-server-linux-client-e.x.p-23869.zip 24680832 +SHA256 0d585a3eec68e8ee2d06dc64c9e7613fa12ce5095a5fbaf8f101fd008041687d VMware-server-linux-client-e.x.p-23869.zip 24680832 diff --git a/app-emulation/vmware-server-console/vmware-server-console-1.0.0.22874.ebuild b/app-emulation/vmware-server-console/vmware-server-console-1.0.0.23869.ebuild index c9948b0..640aefd 100644 --- a/app-emulation/vmware-server-console/vmware-server-console-1.0.0.22874.ebuild +++ b/app-emulation/vmware-server-console/vmware-server-console-1.0.0.23869.ebuild @@ -8,11 +8,11 @@ inherit eutils versionator -MY_PN="VMware-console" +MY_PN=${PN/vm/VM} MY_PV="e.x.p-$(get_version_component_range 4)" NP="${MY_PN}-${MY_PV}" FN="VMware-server-linux-client-${MY_PV}" -S="${WORKDIR}/vmware-console-distrib" +S="${WORKDIR}/${PN}-distrib" DESCRIPTION="VMware Remote Console for Linux" HOMEPAGE="http://www.vmware.com/" @@ -55,7 +55,8 @@ RDEPEND=">=sys-libs/glibc-2.3.5 >=dev-lang/perl-5 " -dir=/opt/vmware/server/console +etcdir="/etc/${PN}" +dir="/opt/vmware/server/console" Ddir=${D}/${dir} src_unpack() { @@ -80,13 +81,13 @@ src_install() { insinto ${dir}/doc doins doc/EULA || die "copying EULA" - doman ${S}/man/man1/vmware-console.1.gz || die "doman" + doman ${S}/man/man1/${PN}.1.gz || die "doman" # vmware enviroment - doenvd ${FILESDIR}/99vmware-console || die "doenvd" + doenvd ${FILESDIR}/99${PN} || die "doenvd" - dodir /etc/vmware-console/ - cp -pPR etc/* ${D}/etc/vmware-console/ + dodir ${etcdir} + cp -pPR etc/* ${D}${etcdir} insinto ${dir}/lib/icon newins ${S}/doc/icon48x48.png ${PN}.png || die @@ -94,14 +95,14 @@ src_install() { insinto /usr/share/mime/packages doins ${FILESDIR}/vmware.xml - make_desktop_entry vmware-console "VMWare Remote Console" ${PN}.png + make_desktop_entry ${PN} "VMWare Remote Console" ${PN}.png dodir /usr/bin - dosym ${dir}/bin/vmware-console /usr/bin/vmware-console + dosym ${dir}/bin/${PN} /usr/bin/${PN} # Questions: - einfo "Adding answers to /etc/vmware-console/locations" - locations="${D}/etc/vmware-console/locations" + einfo "Adding answers to ${etcdir}/locations" + locations="${D}${etcdir}/locations" echo "answer BINDIR ${dir}/bin" >> ${locations} echo "answer LIBDIR ${dir}/lib" >> ${locations} echo "answer MANDIR ${dir}/man" >> ${locations} @@ -119,31 +120,31 @@ pkg_preinst() { #Note: it's a bit weird to use ${D} in a preinst script but it should work #(drobbins, 1 Feb 2002) - einfo "Generating /etc/vmware-console/locations file." + einfo "Generating ${etcdir}/locations file." d=`echo ${D} | wc -c` - for x in `find ${Ddir} ${D}/etc/vmware-console` ; do + for x in `find ${Ddir} ${D}${etcdir}` ; do x="`echo ${x} | cut -c ${d}-`" if [ -d ${D}/${x} ] ; then - echo "directory ${x}" >> ${D}/etc/vmware-console/locations + echo "directory ${x}" >> ${D}${etcdir}/locations else - echo -n "file ${x}" >> ${D}/etc/vmware-console/locations - if [ "${x}" == "/etc/vmware-console/locations" ] ; then - echo "" >> ${D}/etc/vmware-console/locations - elif [ "${x}" == "/etc/vmware-console/not_configured" ] ; then - echo "" >> ${D}/etc/vmware-console/locations + echo -n "file ${x}" >> ${D}${etcdir}/locations + if [ "${x}" == "${etcdir}/locations" ] ; then + echo "" >> ${D}${etcdir}/locations + elif [ "${x}" == "${etcdir}/not_configured" ] ; then + echo "" >> ${D}${etcdir}/locations else - echo -n " " >> ${D}/etc/vmware-console/locations - #perl -e "@a = stat('${D}${x}'); print \$a[9]" >> ${D}/etc/vmware-console/locations - find ${D}${x} -printf %T@ >> ${D}/etc/vmware-console/locations - echo "" >> ${D}/etc/vmware-console/locations + echo -n " " >> ${D}${etcdir}/locations + #perl -e "@a = stat('${D}${x}'); print \$a[9]" >> ${D}${etcdir}/locations + find ${D}${x} -printf %T@ >> ${D}${etcdir}/locations + echo "" >> ${D}${etcdir}/locations fi fi done } pkg_config() { - einfo "Running ${ROOT}${dir}/bin/vmware-config-console.pl" - ${ROOT}${dir}/bin/vmware-config-console.pl + einfo "Running ${ROOT}${dir}/bin/vmware-config-server-console.pl" + ${ROOT}${dir}/bin/vmware-config-server-console.pl } pkg_postinst() { @@ -152,16 +153,20 @@ pkg_postinst() { # This is to fix the problem where the not_configured file doesn't get # removed when the configuration is run. This doesn't remove the file # It just tells the vmware-config-console.pl script it can delete it. - einfo "Updating /etc/vmware-console/locations" - for x in "${ROOT}/etc/vmware-console/._cfg????_locations" ; do + einfo "Updating ${etcdir}/locations" + for x in "${ROOT}${etcdir}/._cfg????_locations" ; do if [ -f $x ] ; then - cat $x >> "${ROOT}/etc/vmware-console/locations" + cat $x >> "${ROOT}${etcdir}/locations" rm $x fi done einfo - einfo "You need to run ${dir}/bin/vmware-config-console.pl to complete the install." + einfo "You need to run" + einfo + einfo " ${dir}/bin/vmware-config-server-console.pl" + einfo + einfo "to complete the install." einfo einfo "For VMware Add-Ons just visit" einfo "http://www.vmware.com/download/downloadaddons.html" @@ -171,6 +176,6 @@ pkg_postinst() { pkg_postrm() { einfo einfo "To remove all traces of vmware you will need to remove the files" - einfo "in /etc/vmware-console/." + einfo "in ${etcdir}." einfo } diff --git a/app-emulation/vmware-server/Manifest b/app-emulation/vmware-server/Manifest index 9561e69..673f06f 100644 --- a/app-emulation/vmware-server/Manifest +++ b/app-emulation/vmware-server/Manifest @@ -1,39 +1,35 @@ +AUX 1.0.0.23869/001_all_no-desktop-icon.patch.bz2 591 RMD160 90a26ecdf04318f0fbeb80089c6a9b116e5d9b8f SHA1 1893a2c426b21cd9a74009268a767657c2bbbb0b SHA256 1ed521e8a076f71e81de7a9f2d1b1225ab402147d946ab1c8e214c948d3ebfe7 size 591 +MD5 a9e3d808aeb87a1d99e00731cc9b16fd files/1.0.0.23869/001_all_no-desktop-icon.patch.bz2 591 +RMD160 90a26ecdf04318f0fbeb80089c6a9b116e5d9b8f files/1.0.0.23869/001_all_no-desktop-icon.patch.bz2 591 +SHA256 1ed521e8a076f71e81de7a9f2d1b1225ab402147d946ab1c8e214c948d3ebfe7 files/1.0.0.23869/001_all_no-desktop-icon.patch.bz2 591 +AUX 1.0.0.23869/002_all_allow-write-access-to-config.patch.bz2 415 RMD160 0b0a707a452dea6b46496a87e4aff36977b0faea SHA1 6ab8652ea473657b44caa4239c1db5b0ad641e53 SHA256 3d5724f862e892da4da315409388f9bd4f0b69974464edfdd86c7f2300a593c5 size 415 +MD5 abaf9e4004f4f44786f642c60943368e files/1.0.0.23869/002_all_allow-write-access-to-config.patch.bz2 415 +RMD160 0b0a707a452dea6b46496a87e4aff36977b0faea files/1.0.0.23869/002_all_allow-write-access-to-config.patch.bz2 415 +SHA256 3d5724f862e892da4da315409388f9bd4f0b69974464edfdd86c7f2300a593c5 files/1.0.0.23869/002_all_allow-write-access-to-config.patch.bz2 415 +AUX 1.0.0.23869/004_all_do-not-build-modules.patch.bz2 326 RMD160 0af990940c985a547e8a9f0618f425c930958bd9 SHA1 629fa56356fc7d192851462475d4ea68038d6dcc SHA256 96bd84dedd7e6b0fcd4e277edd72bc5e9b8a2af61cf69e4dcc909939844afc8e size 326 +MD5 7586fe57565d4d49b7ea86e299c73d58 files/1.0.0.23869/004_all_do-not-build-modules.patch.bz2 326 +RMD160 0af990940c985a547e8a9f0618f425c930958bd9 files/1.0.0.23869/004_all_do-not-build-modules.patch.bz2 326 +SHA256 96bd84dedd7e6b0fcd4e277edd72bc5e9b8a2af61cf69e4dcc909939844afc8e files/1.0.0.23869/004_all_do-not-build-modules.patch.bz2 326 +AUX 1.0.0.23869/005_all_do-not-overwrite-authd-file.patch.bz2 1021 RMD160 5df7d833b2a9cc6308e3f810bab59fc8d0148cff SHA1 767f3e274d99bad6793e248b97bcd83e7c0e4940 SHA256 b80e09e61750cd9a1ec61567ac66f46c5a98609c9b4b8fdb00e8258388907f17 size 1021 +MD5 18efb525c50303690b7e62100ab679fd files/1.0.0.23869/005_all_do-not-overwrite-authd-file.patch.bz2 1021 +RMD160 5df7d833b2a9cc6308e3f810bab59fc8d0148cff files/1.0.0.23869/005_all_do-not-overwrite-authd-file.patch.bz2 1021 +SHA256 b80e09e61750cd9a1ec61567ac66f46c5a98609c9b4b8fdb00e8258388907f17 files/1.0.0.23869/005_all_do-not-overwrite-authd-file.patch.bz2 1021 +AUX 1.0.0.23869/006_all_xinetd-sendsig-if-possible.patch.bz2 578 RMD160 8f6ac493645052e01a9f1d9a362b5f3e279c978a SHA1 9b100b25f96ceaaef635c8647aa8509fcf9a77bf SHA256 61fec28b0ca3816c4482ade0bc6c8873f0004ac8d4bf591bdd723ec1dce9539a size 578 +MD5 c1d1346424f0d696f0c574f0eef33880 files/1.0.0.23869/006_all_xinetd-sendsig-if-possible.patch.bz2 578 +RMD160 8f6ac493645052e01a9f1d9a362b5f3e279c978a files/1.0.0.23869/006_all_xinetd-sendsig-if-possible.patch.bz2 578 +SHA256 61fec28b0ca3816c4482ade0bc6c8873f0004ac8d4bf591bdd723ec1dce9539a files/1.0.0.23869/006_all_xinetd-sendsig-if-possible.patch.bz2 578 +AUX 1.0.0.23869/007_all_use-modprobe-over-insmod.patch.bz2 285 RMD160 2cf05a82e5f910b9ea1e7465d9b0ac0385ec0507 SHA1 56c2c96dbed4e5d9c3019c4e12615ff28c2a808f SHA256 64452897438eac7d607236cf1445257841be0c9b76643ea764c10651489f3f90 size 285 +MD5 62708ead43724d76b08f526a798c8e87 files/1.0.0.23869/007_all_use-modprobe-over-insmod.patch.bz2 285 +RMD160 2cf05a82e5f910b9ea1e7465d9b0ac0385ec0507 files/1.0.0.23869/007_all_use-modprobe-over-insmod.patch.bz2 285 +SHA256 64452897438eac7d607236cf1445257841be0c9b76643ea764c10651489f3f90 files/1.0.0.23869/007_all_use-modprobe-over-insmod.patch.bz2 285 AUX 90vmware-server 91 RMD160 2a9e2e9d428a06ceac7faec500e6b1423da34b25 SHA1 e090847500dd99d161a46cd361ed2297b3d3ecae SHA256 3175cd9665850cf0d25a96849135c93ab129127370d55572f0137ba3d210e423 size 91 MD5 d845f6ccdeb1a1ffda1fb84c09a473ee files/90vmware-server 91 RMD160 2a9e2e9d428a06ceac7faec500e6b1423da34b25 files/90vmware-server 91 SHA256 3175cd9665850cf0d25a96849135c93ab129127370d55572f0137ba3d210e423 files/90vmware-server 91 -AUX vmware-server-1.0.0.22874-config.patch 1131 RMD160 3ab69d825994cc3bb177143d27091fc292cec46a SHA1 14264460c8500f1ead267059e2b9b9a5dc8c057f SHA256 b4055370b0092e71a2b2b0f27edeb7bc063ad265f95ab4530e52c3ab3167ad62 size 1131 -MD5 23d97e5e436a0d827b48db3ed9948aa7 files/vmware-server-1.0.0.22874-config.patch 1131 -RMD160 3ab69d825994cc3bb177143d27091fc292cec46a files/vmware-server-1.0.0.22874-config.patch 1131 -SHA256 b4055370b0092e71a2b2b0f27edeb7bc063ad265f95ab4530e52c3ab3167ad62 files/vmware-server-1.0.0.22874-config.patch 1131 -AUX vmware-server-1.0.0.22874-config2.patch 647 RMD160 0f25f7dd60dfcb5a72b1f7b9cf344d6f431143a9 SHA1 cabd3dd071ef62d4c70f52d1a3e02334ec7f3a73 SHA256 41492cde60da6d449c0f427ac7bd65598838ec17ac0e3a5f545feeb1d29ea391 size 647 -MD5 3df74f4dfaa783b6a2f9eba3f0030afa files/vmware-server-1.0.0.22874-config2.patch 647 -RMD160 0f25f7dd60dfcb5a72b1f7b9cf344d6f431143a9 files/vmware-server-1.0.0.22874-config2.patch 647 -SHA256 41492cde60da6d449c0f427ac7bd65598838ec17ac0e3a5f545feeb1d29ea391 files/vmware-server-1.0.0.22874-config2.patch 647 -AUX vmware-server-1.0.0.22874-config4.patch 589 RMD160 b2153579c65a232de9c2e6dbd9bbe108d85f95e5 SHA1 394a67a30f1f29084836183303641915ce982bfd SHA256 916754b0616ea330490b9572be1a9216bb7dd441ba328b1e01e777b29fac4e1e size 589 -MD5 8b7edbd7b3b93bf2b437f88cfa375f28 files/vmware-server-1.0.0.22874-config4.patch 589 -RMD160 b2153579c65a232de9c2e6dbd9bbe108d85f95e5 files/vmware-server-1.0.0.22874-config4.patch 589 -SHA256 916754b0616ea330490b9572be1a9216bb7dd441ba328b1e01e777b29fac4e1e files/vmware-server-1.0.0.22874-config4.patch 589 -AUX vmware-server-1.0.0.22874-config5.patch 2113 RMD160 88619cb1a448e95c5b8dbf1e269abead6f849dfb SHA1 40b6a413cf6da2fb162c5a753d240dfbb1a42bc6 SHA256 c6056047d1226ada3328fea2d7827f632cfab9b155a001388294836a1ab8780e size 2113 -MD5 7fc2b46e200ef3ccf5e200e73b28c02d files/vmware-server-1.0.0.22874-config5.patch 2113 -RMD160 88619cb1a448e95c5b8dbf1e269abead6f849dfb files/vmware-server-1.0.0.22874-config5.patch 2113 -SHA256 c6056047d1226ada3328fea2d7827f632cfab9b155a001388294836a1ab8780e files/vmware-server-1.0.0.22874-config5.patch 2113 -AUX vmware-server-1.0.0.22874-config6.patch 1227 RMD160 f27ea918c99e6a3db0fba8d53b5329833aa4cc58 SHA1 43986e1a5af682db2799a336f10c62fa27b7ca46 SHA256 1fcbbdf11f99f80881ee43ae47ed099d5f10aa3985bfe16606fdf2d307836ff0 size 1227 -MD5 7990840c4bacdd7ce2baf98194c43f77 files/vmware-server-1.0.0.22874-config6.patch 1227 -RMD160 f27ea918c99e6a3db0fba8d53b5329833aa4cc58 files/vmware-server-1.0.0.22874-config6.patch 1227 -SHA256 1fcbbdf11f99f80881ee43ae47ed099d5f10aa3985bfe16606fdf2d307836ff0 files/vmware-server-1.0.0.22874-config6.patch 1227 -AUX vmware-server-1.0.0.22874-services.patch 448 RMD160 136dfcfe2df7a7ebf2844749f473a6c6d0bb3084 SHA1 0ad152b3cb738521296322b56e9f247926690e67 SHA256 9497f8ad6acb2460e27bd5430670e79129ec2ffbf6f5b8dae62084e5e56059ee size 448 -MD5 f5a4bba93e2ef942332dbe7105f2b204 files/vmware-server-1.0.0.22874-services.patch 448 -RMD160 136dfcfe2df7a7ebf2844749f473a6c6d0bb3084 files/vmware-server-1.0.0.22874-services.patch 448 -SHA256 9497f8ad6acb2460e27bd5430670e79129ec2ffbf6f5b8dae62084e5e56059ee files/vmware-server-1.0.0.22874-services.patch 448 -AUX vmware-server-1.0.0.22874-vmware-authd-amd64 460 RMD160 93b5083c435460b445bff4f934589ef563ce1efc SHA1 34cdb23333a0ead3edfc6c3ebcf044d554e7a281 SHA256 b74a8935915a9e8325c675de4f1a0c041870b85c897d55836bd898803c96a9cf size 460 -MD5 a03ce9b0007ec5f7ee20b513ec9364ff files/vmware-server-1.0.0.22874-vmware-authd-amd64 460 -RMD160 93b5083c435460b445bff4f934589ef563ce1efc files/vmware-server-1.0.0.22874-vmware-authd-amd64 460 -SHA256 b74a8935915a9e8325c675de4f1a0c041870b85c897d55836bd898803c96a9cf files/vmware-server-1.0.0.22874-vmware-authd-amd64 460 -AUX vmware-server-1.0.0.22874-vmware-authd-x86 315 RMD160 3624da708d60aa1c1319278553cc96ac07324bb4 SHA1 91bb3c7dd6651ac81765e23d4f83fcbd5ae9af0e SHA256 490794ea4c6e35fb4113c8cf17d3872ae5877ddec5f8e0164203e96cf48f5ef2 size 315 -MD5 a237d4e862ce8615d286c979dd9fd2fd files/vmware-server-1.0.0.22874-vmware-authd-x86 315 -RMD160 3624da708d60aa1c1319278553cc96ac07324bb4 files/vmware-server-1.0.0.22874-vmware-authd-x86 315 -SHA256 490794ea4c6e35fb4113c8cf17d3872ae5877ddec5f8e0164203e96cf48f5ef2 files/vmware-server-1.0.0.22874-vmware-authd-x86 315 +AUX vmware-authd 315 RMD160 3624da708d60aa1c1319278553cc96ac07324bb4 SHA1 91bb3c7dd6651ac81765e23d4f83fcbd5ae9af0e SHA256 490794ea4c6e35fb4113c8cf17d3872ae5877ddec5f8e0164203e96cf48f5ef2 size 315 +MD5 a237d4e862ce8615d286c979dd9fd2fd files/vmware-authd 315 +RMD160 3624da708d60aa1c1319278553cc96ac07324bb4 files/vmware-authd 315 +SHA256 490794ea4c6e35fb4113c8cf17d3872ae5877ddec5f8e0164203e96cf48f5ef2 files/vmware-authd 315 AUX vmware.rc 1431 RMD160 862c9ea3471412123dcefca69b793ce597afe859 SHA1 1827c640fe5eb365331859fd024384b5bd6063d1 SHA256 6ec6c667133ea5445df8dd52d8accac6e0177bbdfb4d067b4c68a315acabdf13 size 1431 MD5 8f5b4988c119df62fc6c4e8a6d113f92 files/vmware.rc 1431 RMD160 862c9ea3471412123dcefca69b793ce597afe859 files/vmware.rc 1431 @@ -42,12 +38,12 @@ AUX vmware.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c SHA1 02db2ee MD5 aa1b576735134579f04b29763901dc4f files/vmware.xml 1592 RMD160 0d7e9ed13ebb3c73dd847e95fa95499296609e8c files/vmware.xml 1592 SHA256 56aafee80ad705e8d832f8853c36d763d37b87d1cb132a41c50eb63085ae854d files/vmware.xml 1592 -DIST VMware-server-e.x.p-22874.tar.gz 109791654 RMD160 c7356ba7e40aad4bb7caf886503a9c70071766d8 SHA256 6f63ccdc167a969e52d9185dffa70960b5c2a49afb27193c38511af0649aa627 size 109791654 -DIST vmware-server-1.0.0.22874-rpath-corrected-libs.tar.bz2 73834 RMD160 7f64627b5b945e8d7dabe39c165a4b66b71fb4d3 SHA256 c42299dd033187c67b45b739da66583fbd94cdcba745200b89a25ac96cd9364b size 73834 -EBUILD vmware-server-1.0.0.22874-r1.ebuild 9487 RMD160 75804f11b10d46880848c72de5f3e5a6739168e1 SHA1 e277f688b13f519d55331718ff02d3adb7f269cd SHA256 fb979ffafdbceb9c9244fc6405e821a36fff2466358ae519e187429c04913598 size 9487 -MD5 3826388381aac5e10b82171381ca8795 vmware-server-1.0.0.22874-r1.ebuild 9487 -RMD160 75804f11b10d46880848c72de5f3e5a6739168e1 vmware-server-1.0.0.22874-r1.ebuild 9487 -SHA256 fb979ffafdbceb9c9244fc6405e821a36fff2466358ae519e187429c04913598 vmware-server-1.0.0.22874-r1.ebuild 9487 -MD5 396875f969eb13503175ed23573ef275 files/digest-vmware-server-1.0.0.22874-r1 626 -RMD160 8c579941b2f3b97f367ecaf0c21e2f3debbba470 files/digest-vmware-server-1.0.0.22874-r1 626 -SHA256 77d8c14a264f040040ffc1d9a388ca1580d364a3217fe499d3dac625175551b0 files/digest-vmware-server-1.0.0.22874-r1 626 +DIST VMware-server-e.x.p-23869.tar.gz 106669636 RMD160 ded4828f4f7d630babc6564031c82bac964c8b58 SHA256 d675a7249064bed1eee89d0f0cfad6d9eae3acb13ebcf2be18563ef1ed0a2761 size 106669636 +DIST vmware-server-1.0.0.23869-rpath-corrected-libs.tar.bz2 73834 RMD160 7f64627b5b945e8d7dabe39c165a4b66b71fb4d3 SHA256 c42299dd033187c67b45b739da66583fbd94cdcba745200b89a25ac96cd9364b size 73834 +EBUILD vmware-server-1.0.0.23869.ebuild 8560 RMD160 5bf5e4e280f936fe4eaf3a1a6c9f167d44e61143 SHA1 856fb26d2af70ae567eb5a4e69f606764e277aed SHA256 c0a757ddb99e7de4c525a4c014d31c1fda2e6f02d1d03d59ccdaf25e0d9b5baa size 8560 +MD5 4e0b121725299ffb85150ae05cb967ff vmware-server-1.0.0.23869.ebuild 8560 +RMD160 5bf5e4e280f936fe4eaf3a1a6c9f167d44e61143 vmware-server-1.0.0.23869.ebuild 8560 +SHA256 c0a757ddb99e7de4c525a4c014d31c1fda2e6f02d1d03d59ccdaf25e0d9b5baa vmware-server-1.0.0.23869.ebuild 8560 +MD5 86bed5ceecd60c191a5939bae0079cbf files/digest-vmware-server-1.0.0.23869 626 +RMD160 7bc628baa43745c6e9397d90938c7c3a46e173e3 files/digest-vmware-server-1.0.0.23869 626 +SHA256 b0a517f2e25ea346f26a57f13d6746cb610b3574463e63cdfc3e2c955135724d files/digest-vmware-server-1.0.0.23869 626 diff --git a/app-emulation/vmware-server/files/1.0.0.23869/001_all_no-desktop-icon.patch.bz2 b/app-emulation/vmware-server/files/1.0.0.23869/001_all_no-desktop-icon.patch.bz2 Binary files differnew file mode 100644 index 0000000..b8753a9 --- /dev/null +++ b/app-emulation/vmware-server/files/1.0.0.23869/001_all_no-desktop-icon.patch.bz2 diff --git a/app-emulation/vmware-server/files/1.0.0.23869/002_all_allow-write-access-to-config.patch.bz2 b/app-emulation/vmware-server/files/1.0.0.23869/002_all_allow-write-access-to-config.patch.bz2 Binary files differnew file mode 100644 index 0000000..3c71484 --- /dev/null +++ b/app-emulation/vmware-server/files/1.0.0.23869/002_all_allow-write-access-to-config.patch.bz2 diff --git a/app-emulation/vmware-server/files/1.0.0.23869/004_all_do-not-build-modules.patch.bz2 b/app-emulation/vmware-server/files/1.0.0.23869/004_all_do-not-build-modules.patch.bz2 Binary files differnew file mode 100644 index 0000000..89df6a0 --- /dev/null +++ b/app-emulation/vmware-server/files/1.0.0.23869/004_all_do-not-build-modules.patch.bz2 diff --git a/app-emulation/vmware-server/files/1.0.0.23869/005_all_do-not-overwrite-authd-file.patch.bz2 b/app-emulation/vmware-server/files/1.0.0.23869/005_all_do-not-overwrite-authd-file.patch.bz2 Binary files differnew file mode 100644 index 0000000..c2f4020 --- /dev/null +++ b/app-emulation/vmware-server/files/1.0.0.23869/005_all_do-not-overwrite-authd-file.patch.bz2 diff --git a/app-emulation/vmware-server/files/1.0.0.23869/006_all_xinetd-sendsig-if-possible.patch.bz2 b/app-emulation/vmware-server/files/1.0.0.23869/006_all_xinetd-sendsig-if-possible.patch.bz2 Binary files differnew file mode 100644 index 0000000..38796f9 --- /dev/null +++ b/app-emulation/vmware-server/files/1.0.0.23869/006_all_xinetd-sendsig-if-possible.patch.bz2 diff --git a/app-emulation/vmware-server/files/1.0.0.23869/007_all_use-modprobe-over-insmod.patch.bz2 b/app-emulation/vmware-server/files/1.0.0.23869/007_all_use-modprobe-over-insmod.patch.bz2 Binary files differnew file mode 100644 index 0000000..0b42fad --- /dev/null +++ b/app-emulation/vmware-server/files/1.0.0.23869/007_all_use-modprobe-over-insmod.patch.bz2 diff --git a/app-emulation/vmware-server/files/digest-vmware-server-1.0.0.22874-r1 b/app-emulation/vmware-server/files/digest-vmware-server-1.0.0.22874-r1 deleted file mode 100644 index 1325ed7..0000000 --- a/app-emulation/vmware-server/files/digest-vmware-server-1.0.0.22874-r1 +++ /dev/null @@ -1,6 +0,0 @@ -MD5 3ef78e4deb44e51e99043e008c5a0e90 VMware-server-e.x.p-22874.tar.gz 109791654 -RMD160 c7356ba7e40aad4bb7caf886503a9c70071766d8 VMware-server-e.x.p-22874.tar.gz 109791654 -SHA256 6f63ccdc167a969e52d9185dffa70960b5c2a49afb27193c38511af0649aa627 VMware-server-e.x.p-22874.tar.gz 109791654 -MD5 e494568dd025080cc80e7ad801f0b743 vmware-server-1.0.0.22874-rpath-corrected-libs.tar.bz2 73834 -RMD160 7f64627b5b945e8d7dabe39c165a4b66b71fb4d3 vmware-server-1.0.0.22874-rpath-corrected-libs.tar.bz2 73834 -SHA256 c42299dd033187c67b45b739da66583fbd94cdcba745200b89a25ac96cd9364b vmware-server-1.0.0.22874-rpath-corrected-libs.tar.bz2 73834 diff --git a/app-emulation/vmware-server/files/digest-vmware-server-1.0.0.23869 b/app-emulation/vmware-server/files/digest-vmware-server-1.0.0.23869 new file mode 100644 index 0000000..1ef80e4 --- /dev/null +++ b/app-emulation/vmware-server/files/digest-vmware-server-1.0.0.23869 @@ -0,0 +1,6 @@ +MD5 fdce90d9f91f0ca5329105e2d8be75f0 VMware-server-e.x.p-23869.tar.gz 106669636 +RMD160 ded4828f4f7d630babc6564031c82bac964c8b58 VMware-server-e.x.p-23869.tar.gz 106669636 +SHA256 d675a7249064bed1eee89d0f0cfad6d9eae3acb13ebcf2be18563ef1ed0a2761 VMware-server-e.x.p-23869.tar.gz 106669636 +MD5 e494568dd025080cc80e7ad801f0b743 vmware-server-1.0.0.23869-rpath-corrected-libs.tar.bz2 73834 +RMD160 7f64627b5b945e8d7dabe39c165a4b66b71fb4d3 vmware-server-1.0.0.23869-rpath-corrected-libs.tar.bz2 73834 +SHA256 c42299dd033187c67b45b739da66583fbd94cdcba745200b89a25ac96cd9364b vmware-server-1.0.0.23869-rpath-corrected-libs.tar.bz2 73834 diff --git a/app-emulation/vmware-server/files/vmware-server-1.0.0.22874-vmware-authd-x86 b/app-emulation/vmware-server/files/vmware-authd index fce8f64..fce8f64 100644 --- a/app-emulation/vmware-server/files/vmware-server-1.0.0.22874-vmware-authd-x86 +++ b/app-emulation/vmware-server/files/vmware-authd diff --git a/app-emulation/vmware-server/files/vmware-server-1.0.0.22874-config.patch b/app-emulation/vmware-server/files/vmware-server-1.0.0.22874-config.patch deleted file mode 100644 index 1d864f7..0000000 --- a/app-emulation/vmware-server/files/vmware-server-1.0.0.22874-config.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- vmware-distrib/bin/vmware-config.pl.ori 2005-11-09 01:45:08.000000000 +0000 -+++ vmware-distrib/bin/vmware-config.pl 2005-11-09 01:48:21.000000000 +0000 -@@ -8433,7 +8433,7 @@ - error('Please shut down any running VMs and run this script again.' . - "\n\n"); - } else { -- if (system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware') -+ if (system(shell_string('/etc/init.d' . '/vmware') - . ' stop')) { - error('Unable to stop services for ' . vmware_product_name() . - "\n\n"); -@@ -8463,8 +8463,8 @@ - } - if (vmware_product() ne 'server') { - configure_gtk2(); -- createMimePackageFile(); -- configureDesktopFiles(); -+# createMimePackageFile(); -+# configureDesktopFiles(); - configure_mon(); - configure_pp(); - configure_net(); -@@ -8532,7 +8532,7 @@ - db_save(); - # Then start VMware's services - if (!$gOption{'skipstopstart'}) { -- system(shell_string(db_get_answer('INITSCRIPTSDIR') . '/vmware') . ' start'); -+ system(shell_string('/etc/init.d' . '/vmware') . ' start'); - print "\n"; - } - diff --git a/app-emulation/vmware-server/files/vmware-server-1.0.0.22874-config2.patch b/app-emulation/vmware-server/files/vmware-server-1.0.0.22874-config2.patch deleted file mode 100644 index e646b7b..0000000 --- a/app-emulation/vmware-server/files/vmware-server-1.0.0.22874-config2.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -urN vmware-distrib.orig/bin/vmware-config.pl vmware-distrib/bin/vmware-config.pl ---- vmware-distrib.orig/bin/vmware-config.pl 2005-12-16 00:51:03.000000000 -0500 -+++ vmware-distrib/bin/vmware-config.pl 2005-12-21 14:34:03.000000000 -0500 -@@ -7327,7 +7327,10 @@ - error('Unable to write configuration file "' . $name . '".' . "\n\n"); - } - db_add_file($name, 0x1); -- safe_chmod(0644, $name); -+ safe_chmod(0664, $name); -+ my $gid = (getgrnam('vmware'))[2]; -+ my $uid = (stat($name))[4]; -+ safe_chown($uid,$gid,$name); - - # Append the promotional configuration if it exists - $promoconfig = $libdir . '/configurator/PROMOCONFIG'; diff --git a/app-emulation/vmware-server/files/vmware-server-1.0.0.22874-config4.patch b/app-emulation/vmware-server/files/vmware-server-1.0.0.22874-config4.patch deleted file mode 100644 index cec3b3e..0000000 --- a/app-emulation/vmware-server/files/vmware-server-1.0.0.22874-config4.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -uNr vmware-server-distrib.orig/bin/vmware-config.pl vmware-server-distrib/bin/vmware-config.pl ---- vmware-server-distrib.orig/bin/vmware-config.pl 2006-02-18 18:12:26.000000000 +0000 -+++ vmware-server-distrib/bin/vmware-config.pl 2006-02-18 18:14:17.000000000 +0000 -@@ -8571,10 +8571,10 @@ - configure_gtk2(); - # createMimePackageFile(); - # configureDesktopFiles(); -- configure_mon(); -- configure_pp(); -+# configure_mon(); -+# configure_pp(); - configure_net(); -- build_vmnet(); -+# build_vmnet(); - } - - # Create the directory for the UNIX domain sockets diff --git a/app-emulation/vmware-server/files/vmware-server-1.0.0.22874-config5.patch b/app-emulation/vmware-server/files/vmware-server-1.0.0.22874-config5.patch deleted file mode 100644 index 55d4447..0000000 --- a/app-emulation/vmware-server/files/vmware-server-1.0.0.22874-config5.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- vmware-server-distrib/bin/vmware-config.pl 2006-03-17 21:13:22.000000000 +0100 -+++ vmware-server-distrib/bin/vmware-config.pl 2006-03-17 22:37:00.000000000 +0100 -@@ -6278,10 +6278,36 @@ - my $authd_conf_file = "$conf_dir/vmware-authd"; - my $authd = db_get_answer('SBINDIR') . "/vmware-authd"; - -+ # Never overwrite an existing conf file unless it has the exact modification -+ # date as in the database in which case we can be pretty sure that it is the -+ # one that we wrote and it should be safe to assume that we can overwrite it. -+ if( -f $authd_conf_file ) { -+ my @statbuf = stat( $authd_conf_file ); -+ if( ! defined( $statbuf[9] ) ) { -+ error( -+ 'Unable to get the last modification timestamp of file "' -+ . $authd_conf_file . "\".\n\n" -+ ); -+ } -+ if( -+ ! db_file_in( $authd_conf_file ) -+ || db_file_ts( $authd_conf_file ) != $statbuf[9] -+ ) { -+ query( -+ 'The file "' . $authd_conf_file . '" already exists and seems to have' -+ . ' been modified manually. Consequently, this program cannot add a "' -+ . $authd . '" entry in the file. You will have to do it by hand' -+ . ' before running ' . vmware_product_name() . ".\n\n" -+ . ' Hit enter to continue.', -+ '', 0 -+ ); -+ return; -+ } -+ } -+ - # Create the new vmware-authd file -- # XXX This file should be registered with the installer's database. --hpreg - if (not open(CONF, '>' . $authd_conf_file)) { -- query('Unable to create the "' . $authd_conf_file . '"file. ' -+ query('Unable to create the "' . $authd_conf_file . '" file. ' - . 'Consequently, this program cannot add a "' . $authd . '" entry ' - . 'in the file. You will have to do it by hand before running ' - . vmware_product_name() . '.' . "\n\n" . 'Hit enter to continue.', -@@ -6304,6 +6330,8 @@ - END - close CONF; - -+ db_add_file( $authd_conf_file, 0x1 ); -+ - # Make sure the IP service is registered, as RH 9.0's xinetd is picky about - # that (was bug 26864). --hpreg - if (check_port_not_registered($port) == 1) { diff --git a/app-emulation/vmware-server/files/vmware-server-1.0.0.22874-config6.patch b/app-emulation/vmware-server/files/vmware-server-1.0.0.22874-config6.patch deleted file mode 100644 index 89c4e16..0000000 --- a/app-emulation/vmware-server/files/vmware-server-1.0.0.22874-config6.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- vmware-server-distrib/bin/vmware-config.pl 2006-03-20 20:04:45.000000000 +0000 -+++ vmware-server-distrib/bin/vmware-config.pl 2006-03-20 20:08:01.000000000 +0000 -@@ -6255,17 +6255,17 @@ - #Restart xinetd - sub restart_xinetd { - my $xinetd_restart = db_get_answer('INITSCRIPTSDIR') . '/xinetd'; -+ if (!system(shell_string($gHelper{'killall'}) . ' -USR2 xinetd')) { -+ return; -+ } - if (-e $xinetd_restart) { -- if (!system(shell_string($xinetd_restart) . ' restart')) { -- return; -+ if (system(shell_string($xinetd_restart) . ' restart')) { -+ query('Unable to make the Internet super-server (xinetd) re-read its ' -+ . 'configuration file. Please restart xinetd by hand:' . "\n" -+ . ' killall -v -USR2 xinetd' . "\n\n" -+ . 'Hit enter to continue.', '', 0); - } - } -- if (system(shell_string($gHelper{'killall'}) . ' -USR2 xinetd')) { -- query('Unable to make the Internet super-server (xinetd) re-read its ' -- . 'configuration file. Please restart xinetd by hand:' . "\n" -- . ' killall -v -USR2 xinetd' . "\n\n" -- . 'Hit enter to continue.', '', 0); -- } - } - - # Update the Internet super-server's configuration file, and make the diff --git a/app-emulation/vmware-server/files/vmware-server-1.0.0.22874-services.patch b/app-emulation/vmware-server/files/vmware-server-1.0.0.22874-services.patch deleted file mode 100644 index c29a87e..0000000 --- a/app-emulation/vmware-server/files/vmware-server-1.0.0.22874-services.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr vmware-server-distrib/installer/services.sh vmware-server-distrib.new/installer/services.sh ---- vmware-server-distrib/installer/services.sh 2006-02-05 00:21:25.000000000 +0000 -+++ vmware-server-distrib.new/installer/services.sh 2006-02-20 23:48:07.000000000 +0000 -@@ -538,7 +538,7 @@ - } - - vmware_load_module() { -- /sbin/insmod -s -f "/lib/modules/`uname -r`/misc/$1.o" || exit 1 -+ /sbin/modprobe -s -f "$1" || exit 1 - exit 0 - } - diff --git a/app-emulation/vmware-server/files/vmware-server-1.0.0.22874-vmware-authd-amd64 b/app-emulation/vmware-server/files/vmware-server-1.0.0.22874-vmware-authd-amd64 deleted file mode 100644 index de076b4..0000000 --- a/app-emulation/vmware-server/files/vmware-server-1.0.0.22874-vmware-authd-amd64 +++ /dev/null @@ -1,6 +0,0 @@ -#%PAM-1.0 -auth sufficient /emul/linux/x86/lib/security/pam_unix.so shadow nullok -auth required /emul/linux/x86/lib/security/pam_unix_auth.so shadow nullok -account required /emul/linux/x86/lib/security/pam_listfile.so item=group sense=allow file=/etc/vmware/vmwaregroup onerr=fail -account sufficient /emul/linux/x86/lib/security/pam_unix.so -account required /emul/linux/x86/lib/security/pam_unix_acct.so diff --git a/app-emulation/vmware-server/vmware-server-1.0.0.22874-r1.ebuild b/app-emulation/vmware-server/vmware-server-1.0.0.23869.ebuild index 4d16108..755cd9e 100644 --- a/app-emulation/vmware-server/vmware-server-1.0.0.22874-r1.ebuild +++ b/app-emulation/vmware-server/vmware-server-1.0.0.23869.ebuild @@ -6,7 +6,9 @@ # to download VMWare. The agreeing to a licence is part of the configure step # which the user must run manually. -inherit eutils versionator +inherit vmware-pkg eutils versionator + +VMWARE_VME="VME_S1B1" MY_PN="VMware-server" MY_PV="e.x.p-$(get_version_component_range 4)" @@ -16,7 +18,7 @@ S="${WORKDIR}/vmware-server-distrib" DESCRIPTION="VMware Server for Linux" HOMEPAGE="http://www.vmware.com/" SRC_URI="http://download3.vmware.com/software/vmserver/${NP}.tar.gz - http://dev.gentoo.org/~wolf31o2/sources/dump/${P}-rpath-corrected-libs.tar.bz2" + http://dev.gentoo.org/~ikelos/devoverlay-distfiles/${P}-rpath-corrected-libs.tar.bz2" LICENSE="vmware" IUSE="" @@ -53,52 +55,31 @@ RDEPEND=">=sys-libs/glibc-2.3.5 !app-emulation/vmware-workstation sys-apps/pciutils sys-apps/xinetd - >=sys-apps/baselayout-1.11.14 - >=app-emulation/vmware-modules-101" + >=sys-apps/baselayout-1.11.14" +PDEPEND=">=app-emulation/vmware-modules-101" dir=/opt/vmware/server Ddir=${D}/${dir} VMWARE_GROUP=${VMWARE_GROUP:-vmware} +EPATCH_SOURCE=${FILESDIR}/${P} + pkg_setup() { # This is due to both bugs #104480 and #106170 enewgroup "${VMWARE_GROUP}" + + vmware_test_module_build } src_unpack() { unpack ${A} cd ${S} - # patch the config to not install desktop/icon files - epatch ${FILESDIR}/${P}-config.patch - # patch the config to make /etc/vmware/config writable - epatch ${FILESDIR}/${P}-config2.patch - # patch the config to work with kernels above 2.6.12ish - # epatch ${FILESDIR}/${P}-config3.patch - # patch the configure script not to build the modules - epatch ${FILESDIR}/${P}-config4.patch - # patch the config script not to overwrite existing vmware-authd files - epatch ${FILESDIR}/${P}-config5.patch - # patch the config script to play nice with xinetd - epatch ${FILESDIR}/${P}-config6.patch - # patch the services file to modprobe the modules rather than insmod - epatch ${FILESDIR}/${P}-services.patch + + epatch ${FILESDIR}/${PV} # patch the vmware /etc/pam.d file to ensure that only # vmware group members can log in - cp ${FILESDIR}/${P}-vmware-authd-x86 ${S}/etc/pam.d/vmware-authd - use amd64 && cp ${FILESDIR}/${P}-vmware-authd-amd64 ${S}/etc/pam.d/vmware-authd - - # Fix up all the broken rpaths - #einfo "Removing empty RPATH variables from perl libraries..." - - #for sobj in `find ${S}/lib/perl5/site_perl/5.005/ -name *.so -and ! -name PAM.so -and ! -name POSIX.so`; - #do - # Change the permissions for FEATURES="userpriv" - # chmod u+w $sobj - # echo $sobj - # chrpath -d $sobj - # chmod u-w $sobj - #done + cp ${FILESDIR}/vmware-authd ${S}/etc/pam.d/vmware-authd } src_install() { @@ -135,6 +116,9 @@ src_install() { # vmware enviroment doenvd ${FILESDIR}/90vmware-server || die "doenvd" + # Fix the amd64 emulation pam stuff + use amd64 && dosed ":pam_:/emul/linux/x86/lib/security/pam_:" /etc/pam.d/vmware-authd + dodir /etc/vmware/ cp -pPR etc/* ${D}/etc/vmware/ echo "${VMWARE_GROUP}" > ${D}/etc/vmware/vmwaregroup diff --git a/eclass/vmware-pkg.eclass b/eclass/vmware-pkg.eclass new file mode 100644 index 0000000..2354fc9 --- /dev/null +++ b/eclass/vmware-pkg.eclass @@ -0,0 +1,45 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +# +# Original Author: ikelos +# Purpose: Provide vmware packages a method of shared the vmware-modules package +# + +ECLASS="vmware-pkg" +# INHERITED="$INHERITED $ECLASS" + +PDEPEND=">=app-emulation/vmware-modules-101" + +vmware_test_module_failed() { + + eerror + eerror "Please run:" + eerror + eerror " emerge -C app-emulation/vmware-modules" + eerror + eerror "before attemping to install this package" + die "Please run 'emerge -C app-emulation/vmware-modules' before continuing" + +} + +vmware_test_module_build() { + + if has_version "app-emulation/vmware-modules"; then + if test ! -e /opt/vmware/module-build; then + eerror + eerror "Unable to determine which package" + eerror "the vmware-modules were compiled for" + vmware_test_module_failed + else + if test "`cat /opt/vmware/module-build`" != $VMWARE_VME; then + eerror + eerror "The vmware-modules on this system were" + eerror "built for a different version of vmware" + vmware_test_module_failed + fi + fi + fi + +} |