From 5457eacc747fc3f91e10a1f452230b1feac39eff Mon Sep 17 00:00:00 2001 From: Parabola Date: Sun, 19 Jun 2011 02:48:26 +0000 Subject: Sun Jun 19 02:48:26 UTC 2011 --- community-testing/courier-mta/PKGBUILD | 113 --------- community-testing/courier-mta/courier-mta.conf.d | 18 -- community-testing/courier-mta/courier-mta.install | 46 ---- community-testing/courier-mta/courier-mta.rc.d | 60 ----- .../courier-webmail-cleancache.cron.hourly | 6 - community-testing/vhba-module/PKGBUILD | 27 -- .../vhba-module/vhba-kernel2.6.37.patch | 56 ----- community-testing/vhba-module/vhba-module.install | 16 -- community-testing/virtualbox/10-vboxdrv.rules | 5 - community-testing/virtualbox/18-system-xorg.patch | 277 --------------------- community-testing/virtualbox/60-vboxguest.rules | 2 - community-testing/virtualbox/LocalConfig.kmk | 19 -- community-testing/virtualbox/PKGBUILD | 217 ---------------- .../virtualbox/change_default_driver_dir.patch | 18 -- .../virtualbox/vboxdrv-reference.patch | 45 ---- community-testing/virtualbox/vboxdrv.sh | 80 ------ .../virtualbox/virtualbox-4-makeself-check.patch | 10 - .../virtualbox/virtualbox-4-mkisofs-check.patch | 10 - .../virtualbox/virtualbox-guest-modules.install | 24 -- community-testing/virtualbox/virtualbox.install | 65 ----- 20 files changed, 1114 deletions(-) delete mode 100644 community-testing/courier-mta/PKGBUILD delete mode 100644 community-testing/courier-mta/courier-mta.conf.d delete mode 100644 community-testing/courier-mta/courier-mta.install delete mode 100644 community-testing/courier-mta/courier-mta.rc.d delete mode 100644 community-testing/courier-mta/courier-webmail-cleancache.cron.hourly delete mode 100644 community-testing/vhba-module/PKGBUILD delete mode 100644 community-testing/vhba-module/vhba-kernel2.6.37.patch delete mode 100644 community-testing/vhba-module/vhba-module.install delete mode 100644 community-testing/virtualbox/10-vboxdrv.rules delete mode 100644 community-testing/virtualbox/18-system-xorg.patch delete mode 100644 community-testing/virtualbox/60-vboxguest.rules delete mode 100644 community-testing/virtualbox/LocalConfig.kmk delete mode 100644 community-testing/virtualbox/PKGBUILD delete mode 100644 community-testing/virtualbox/change_default_driver_dir.patch delete mode 100644 community-testing/virtualbox/vboxdrv-reference.patch delete mode 100755 community-testing/virtualbox/vboxdrv.sh delete mode 100644 community-testing/virtualbox/virtualbox-4-makeself-check.patch delete mode 100644 community-testing/virtualbox/virtualbox-4-mkisofs-check.patch delete mode 100644 community-testing/virtualbox/virtualbox-guest-modules.install delete mode 100644 community-testing/virtualbox/virtualbox.install (limited to 'community-testing') diff --git a/community-testing/courier-mta/PKGBUILD b/community-testing/courier-mta/PKGBUILD deleted file mode 100644 index 6ac1618dc..000000000 --- a/community-testing/courier-mta/PKGBUILD +++ /dev/null @@ -1,113 +0,0 @@ -# $Id: PKGBUILD 75460 2010-04-01 16:56:22Z giovanni $ -# Maintainer: Sven-Hendrik Haase -# Contributor: tobias -# Contributor: Tobias Kieslich - -# ----------- NOTE TO ALL USERS ------------ -# Go read http://www.courier-mta.org/install.html b4 running or building courier - - -pkgname=courier-mta -pkgver=0.66.1 -pkgrel=2 -pkgdesc="IMAP(s)/POP3(s) and SMTP Server with ML-manager, webmail and webconfig" -arch=(i686 x86_64) -license=('GPL2') -backup=('etc/courier/imapd.cnf' 'etc/courier/pop3d.cnf' \ - 'etc/courier/imapd' 'etc/courier/imapd-ssl' \ - 'etc/courier/pop3d' 'etc/courier/pop3d-ssl' \ - 'etc/courier/courierd' 'etc/courier/sqwebmaild' \ - 'etc/courier/esmtpd' 'etc/courier/esmtpd-ssl' \ - 'etc/courier/esmtpd.cnf' 'etc/courier/esmtpd-msa' \ - 'etc/courier/webadmin/password' 'etc/courier/esmtpauthclient' \ - 'etc/conf.d/courier-mta') -url="http://courier-mta.org" -depends=('courier-authlib>=0.63.0' 'fam' 'gcc-libs' 'gdbm' 'pcre' 'mime-types' 'ca-certificates') -optdepends=('libldap') -makedepends=('apache>=2.2.9-3' 'pam>=1.0.1-2' 'expect' 'gnupg' 'libldap' 'fam') -provides=('smtp-server' 'imap-server' 'pop3-server' 'courier-imap' 'courier-maildrop') -conflicts=('courier-imap' 'smtp-server' 'imap-server' 'courier-maildrop' 'ucspi-tcp') -options=('!libtool') -install=courier-mta.install -source=(http://downloads.sourceforge.net/project/courier/courier/${pkgver}/courier-${pkgver}.tar.bz2 - courier-mta.rc.d - courier-mta.conf.d) -md5sums=('79250d71d88ba2bcb630b7356f0250cd' - 'e140f320968e57cfe459cd7a3b4017e0' - 'f3ff70b40c7a1f7a017e8c4cc4d92f4f') - -build() { - cd ${srcdir}/courier-${pkgver} - - # fix a tiny bug - sed -i -e \ - 's|--with-authchangepwdir=/var/tmp/dev/null|--with-authchangepwdir=$libexecdir/authlib|' \ - configure && chmod 755 configure - - # courier is more about configuring than compiling :-), lets start the mess - ./configure --prefix=/usr \ - --sysconfdir=/etc/courier \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --localstatedir=/var/spool/courier \ - --disable-root-check \ - --enable-unicode \ - --enable-workarounds-for-imap-client-bugs \ - --enable-mimetypes=/etc/mime.types \ - --with-piddir=/var/run/courier \ - --with-locking-method=lockf \ - --with-trashquota \ - --with-db=gdbm \ - --with-trashquota \ - --with-random=/dev/urandom --without-ispell \ - --with-mailuser=courier --with-mailgroup=courier \ - --with-certdb=/etc/ssl/certs/ - make -} - -package() { - cd ${srcdir}/courier-${pkgver} - - #chown mail.mail ${pkgdir}/var/spool/courier - make DESTDIR=${pkgdir} install - # docs say we can get rid of those after make - find ${pkgdir} -name '*\.a' -exec -rm -f {} \; - # install the perftest-script for testings - install -Dm755 courier/perftest1 ${pkgdir}/usr/lib/courier/perftest1 - ############################################################################### - # this is what usually "make install-configure" does - # *.dist files get rid of "dist" - for distfile in ${pkgdir}/etc/courier/*.dist; do - mv ${distfile} ${pkgdir}/etc/courier/$(basename ${distfile} .dist) - done - # install pam files according to the layout used in Archlinux - for pamfile in ${pkgdir}/etc/courier/*.authpam; do - sed -i 's|/lib/security/pam_pwdb\.so|pam_unix.so|' ${pamfile} - #echo "password required pam_unix.so" >> $pamfile - install -Dm 644 ${pamfile} \ - ${pkgdir}/etc/pam.d/$(basename ${pamfile} .authpam | sed "s/d$//") - rm -f ${pamfile} - done - - ############################################################################### - # Arch Linux specific tweaks to make things easier for the user - # create passwordfile for webadmin -> standard archwebadmin - sed -i 's|/etc/courier/webadmin/password|$(DESTDIR)/etc/courier/webadmin/password|g' Makefile - yes "archwebadmin" | make DESTDIR=${pkgdir} install-webadmin-password - # arch specific scripts - install -Dm 644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/courier-mta - install -Dm 755 ${srcdir}/${pkgname}.rc.d ${pkgdir}/etc/rc.d/courier-mta - #install -Dm 655 ${srcdir}/courier-webmail-cleancache.cron.hourly \ - # ${pkgdir}/etc/cron.hourly/courier-webmail-cleancache - # bug http://bugs.archlinux.org/task/5154 - find ${pkgdir}/usr/lib -name '*\.a' -exec rm -f {} \; - # fixing some permissions - chown -R courier:courier ${pkgdir}/usr/lib/courier/modules - rm -r ${pkgdir}/var/run - #chown -R courier:courier ${pkgdir}/var/run/courier - chown root:root ${pkgdir}/usr/{.,bin,lib,sbin,share} - # make a link to /usr/sbin/sendmail - install -dm 755 ${pkgdir}/usr/sbin - cd ${pkgdir}/usr/sbin - ln -s ../bin/sendmail ./sendmail -} diff --git a/community-testing/courier-mta/courier-mta.conf.d b/community-testing/courier-mta/courier-mta.conf.d deleted file mode 100644 index 5856a5cda..000000000 --- a/community-testing/courier-mta/courier-mta.conf.d +++ /dev/null @@ -1,18 +0,0 @@ -# -# Parameters to be passed to courier-imap -# -# -# Select the service you want started with courier-imap -# -# Available options : -# esmtpd imapd pop3d esmtpd-ssl imapd-ssl pop3d-ssl webmaild -# -CI_DAEMONS="courier esmtpd imapd pop3d" - -# If you want authdaemond to be automatically started and -# stopped by courier-imap, set this to "true" -AUTO_AUTHDAEMON="false" - -# Courier will start this many seconds after autodaemond if -# AUTO_AUTHDAEMON is set to "true" -AUTO_AUTHDAEMON_LAG=2 diff --git a/community-testing/courier-mta/courier-mta.install b/community-testing/courier-mta/courier-mta.install deleted file mode 100644 index eac627867..000000000 --- a/community-testing/courier-mta/courier-mta.install +++ /dev/null @@ -1,46 +0,0 @@ -# arg 1: the new package version -post_install() { - cat << EOM - --> if you are using LDAP services to provide lookup in sqwebmail or aliases - --> then you have to install: - libldap -EOM - # create the *.dat files - makealiases - makesmtpaccess -} - -pre_upgrade() { - pre_remove $1 -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} - - -pre_remove() { - # manual backup, since courier is always processing the whole directory - # - so it would process "system" AND "system.pacsave" -> bad - [ ! -d /etc/courier/_backup ] && mkdir /etc/courier/_backup - cp /etc/courier/aliases/system /etc/courier/_backup/aliases.system - cp /etc/courier/smtpaccess/default /etc/courier/_backup/smtpaccess.default - cat << EOM - --> the /etc/courier/aliase/system and the /etc/courier/smtpaccess/default - --> files have been backed up to /etc/courier/_backup since the *.pacsave - --> files cannot stay in place. Read about couriers alias handling from the - --> documentation! -EOM -} - -# arg 1: the old package version -post_remove() { - /bin/true -} - -op=$1 -shift - -$op $* diff --git a/community-testing/courier-mta/courier-mta.rc.d b/community-testing/courier-mta/courier-mta.rc.d deleted file mode 100644 index 6c5fbc914..000000000 --- a/community-testing/courier-mta/courier-mta.rc.d +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/bash - -# source application-specific settings -[ -f /etc/conf.d/courier-mta ] && . /etc/conf.d/courier-mta -[ -z $AUTO_AUTHDAEMON_LAG ] && AUTO_AUTHDAEMON_LAG=2 -[ -z $AUTO_AUTHDAEMON ] && AUTO_AUTHDAEMON="false" - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - - [ -d /var/run/courier ] || mkdir -p /var/run/courier - chown courier:courier /var/run/courier - - if [ "$AUTO_AUTHDAEMON" == "true" ]; then - /etc/rc.d/authdaemond start - sleep ${AUTO_AUTHDAEMON_LAG} - fi - if [ ! -f /var/run/daemons/authdaemond ]; then - echo "ERROR: authdaemond is not running" - stat_fail - exit 1 - fi - for daemon in $CI_DAEMONS; do - stat_busy "Starting Courier ${daemon}" - /usr/sbin/${daemon} start - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon $daemon - stat_done - fi - done - ;; - stop) - for daemon in $CI_DAEMONS; do - stat_busy "Stopping Courier ${daemon}" - /usr/sbin/${daemon} stop > /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon $daemon - stat_done - fi - done - if [ "$AUTO_AUTHDAEMON" == "true" ]; then - /etc/rc.d/authdaemond stop - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/community-testing/courier-mta/courier-webmail-cleancache.cron.hourly b/community-testing/courier-mta/courier-webmail-cleancache.cron.hourly deleted file mode 100644 index 6c541321e..000000000 --- a/community-testing/courier-mta/courier-webmail-cleancache.cron.hourly +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -# Cleans the cache of the sqwebmail server -if [ -x /usr/share/sqwebmail/cleancache.pl ]; then - su -c "/usr/share/sqwebmail/cleancache.pl" bin -fi diff --git a/community-testing/vhba-module/PKGBUILD b/community-testing/vhba-module/PKGBUILD deleted file mode 100644 index 43fa2bc67..000000000 --- a/community-testing/vhba-module/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 48166 2011-05-29 11:57:10Z mherych $ -# Maintainer: Mateusz Herych -# Contributor: Charles Lindsay - -pkgname=vhba-module -pkgver=20100822 -_kernver='2.6.39-ARCH' -pkgrel=5 -pkgdesc="Kernel module that emulates SCSI devices" -arch=('i686' 'x86_64') -url="http://cdemu.sourceforge.net/" -license=('GPL2') -depends=('kernel26>=2.6.39' 'kernel26<2.6.40') -makedepends=('kernel26-headers>=2.6.39' 'git') -install=vhba-module.install -source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.gz - vhba-kernel2.6.37.patch) -md5sums=('1d2f06ae33c5d15b7c29e467e4658aa2' - 'f0499fc54f6ef9b8d6ca0b9e940c5906') - -build() { - cd "$srcdir/$pkgname-$pkgver" - git apply -p2 ../vhba-kernel2.6.37.patch - make -j1 KDIR=/usr/src/linux-${_kernver} || return 1 - install -D vhba.ko "$pkgdir/lib/modules/${_kernver}/extra/vhba.ko" || return 1 - sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/vhba-module.install" -} diff --git a/community-testing/vhba-module/vhba-kernel2.6.37.patch b/community-testing/vhba-module/vhba-kernel2.6.37.patch deleted file mode 100644 index e2b619c74..000000000 --- a/community-testing/vhba-module/vhba-kernel2.6.37.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 9ad7ec7fae387f05249b9f4e6accb3bc3b0b8b0f Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Thu, 6 Jan 2011 03:39:26 -0500 -Subject: [PATCH] Make vhba compatible with kernel 2.6.37 SCSI host API - -Due to the SCSI host lock push-down changes introduced in 2.6.37 (see -http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=f281233d3eba15fb225d21ae2e228fd4553d824a -for more details), trying to use current vhba on 2.6.37 leads to oopses -and kernel panics - e.g. see http://bugs.gentoo.org/show_bug.cgi?id=350753 - -Add some #ifdefs to enable compatibility both with 2.6.37 and older API. -Note that if future kernel versions remove the DEF_SCSI_QCMD macro, this -issue will need to be revisited. - -Signed-off-by: Alexandre Rostovtsev ---- - vhba-module/vhba.c | 9 ++++++++- - 1 files changed, 8 insertions(+), 1 deletions(-) - -diff --git a/vhba-module/vhba.c b/vhba-module/vhba.c -index 059f6ce..9d13016 100644 ---- a/vhba-module/vhba.c -+++ b/vhba-module/vhba.c -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #ifdef CONFIG_COMPAT - #include - #endif -@@ -363,7 +364,7 @@ static void vhba_free_command(struct vhba_command *vcmd) - spin_unlock_irqrestore(&vhost->cmd_lock, flags); - } - --static int vhba_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)) -+static int vhba_queuecommand_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)) - { - struct vhba_device *vdev; - int retval; -@@ -388,6 +389,12 @@ static int vhba_queuecommand(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmn - return retval; - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37) -+DEF_SCSI_QCMD(vhba_queuecommand) -+#else -+#define vhba_queuecommand vhba_queuecommand_lck -+#endif -+ - static int vhba_abort(struct scsi_cmnd *cmd) - { - struct vhba_device *vdev; --- -1.7.3.4 - diff --git a/community-testing/vhba-module/vhba-module.install b/community-testing/vhba-module/vhba-module.install deleted file mode 100644 index c3bcbca3f..000000000 --- a/community-testing/vhba-module/vhba-module.install +++ /dev/null @@ -1,16 +0,0 @@ -post_install() { - echo ">> Place 'vhba' in MODULES= in /etc/rc.conf to enable vhba on system boot." - echo ">> This module needs to be recompiled for every kernel version upgrade." - KERNEL_VERSION='2.6.37-ARCH' - depmod $KERNEL_VERSION > /dev/null 2>&1 -} - -post_upgrade() { - post_install -} - -post_remove() { - KERNEL_VERSION='2.6.37-ARCH' - depmod $KERNEL_VERSION > /dev/null 2>&1 -} - diff --git a/community-testing/virtualbox/10-vboxdrv.rules b/community-testing/virtualbox/10-vboxdrv.rules deleted file mode 100644 index 37403ae2f..000000000 --- a/community-testing/virtualbox/10-vboxdrv.rules +++ /dev/null @@ -1,5 +0,0 @@ -KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" ENV{ACL_MANAGE}="1" -SUBSYSTEM=="usb_device", ACTION=="add", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" -SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers" -SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" -SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor" diff --git a/community-testing/virtualbox/18-system-xorg.patch b/community-testing/virtualbox/18-system-xorg.patch deleted file mode 100644 index 4a28b93b6..000000000 --- a/community-testing/virtualbox/18-system-xorg.patch +++ /dev/null @@ -1,277 +0,0 @@ -Description: Build the X.Org driver only for the selected system X Server version. -Author: Michael Meskes , Felix Geyer - -diff --git a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk ---- a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk -+++ b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk -@@ -40,8 +40,8 @@ LIBRARIES += \ - VBoxGuestR3LibShared - ifndef VBOX_ONLY_TESTSUITE - if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd) -- LIBRARIES += \ -- VBoxGuestR3LibXFree86 -+# LIBRARIES += \ -+# VBoxGuestR3LibXFree86 - endif - endif - LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86 -diff --git a/src/VBox/Additions/common/crOpenGL/Makefile.kmk b/src/VBox/Additions/common/crOpenGL/Makefile.kmk ---- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk -+++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk -@@ -63,16 +63,12 @@ VBoxOGL_TEMPLATE = VBOXCROGLR3GUESTDLL - VBoxOGL_INCS = . - if1of ($(KBUILD_TARGET), linux solaris freebsd) - VBoxOGL_INCS += \ -- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \ -- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \ -- $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \ -- $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \ -- $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \ -- $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \ -- $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \ -- $(VBOX_PATH_X11_ROOT)/1.3/xorg \ -+ /usr/include/x11 \ -+ /usr/include/xorg \ -+ /usr/include/pixman-1 \ - $(VBOX_MESA_INCS) \ -- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13 -+ /usr/include/drm \ -+ /usr/include/libdrm - VBoxOGL_DEFS += VBOX_NO_NATIVEGL - endif - -diff --git a/src/VBox/Additions/x11/Makefile.kmk b/src/VBox/Additions/x11/Makefile.kmk ---- a/src/VBox/Additions/x11/Makefile.kmk -+++ b/src/VBox/Additions/x11/Makefile.kmk -@@ -17,6 +17,10 @@ - SUB_DEPTH = ../../../.. - include $(KBUILD_PATH)/subheader.kmk - -+ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110) -+ XSERVER_VERSION := 17 -+endif -+ - # Include sub-makefiles. - if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) - include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk -diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk ---- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk -+++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk -@@ -23,7 +23,6 @@ include $(KBUILD_PATH)/subheader.kmk - # vboxmouse_drv - # - if1of ($(KBUILD_TARGET), linux) -- SYSMODS += vboxmouse_drv - vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD - vboxmouse_drv_DEFS.linux = linux - vboxmouse_drv_DEFS.x86 += __i386__ -@@ -59,7 +58,6 @@ endif - # - # vboxmouse_drv_70 - # --DLLS += vboxmouse_drv_70 - vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_70_DEFS = \ - XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE -@@ -80,7 +78,6 @@ vboxmouse_drv_70_SOURCES = \ - # - # vboxmouse_drv_71 - # --DLLS += vboxmouse_drv_71 - vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS) - vboxmouse_drv_71_INCS := \ -@@ -97,7 +94,6 @@ vboxmouse_drv_71_SOURCES = \ - # - # vboxmouse_drv_13 - # --DLLS += vboxmouse_drv_13 - vboxmouse_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_13_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - vboxmouse_drv_13_INCS := \ -@@ -112,7 +108,6 @@ vboxmouse_drv_13_SOURCES = \ - # - # vboxmouse_drv_14 - # --DLLS += vboxmouse_drv_14 - vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - vboxmouse_drv_14_INCS := \ -@@ -126,7 +121,6 @@ endif - # - # vboxmouse_drv_15 - # --DLLS += vboxmouse_drv_15 - vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - vboxmouse_drv_15_INCS := \ -@@ -141,7 +135,6 @@ vboxmouse_drv_15_SOURCES = \ - # - # vboxmouse_drv_16 - # --DLLS += vboxmouse_drv_16 - vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - vboxmouse_drv_16_INCS := \ -@@ -157,7 +150,6 @@ vboxmouse_drv_16_SOURCES = \ - # - # vboxmouse_drv_17 - # --DLLS += vboxmouse_drv_17 - vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local -@@ -177,7 +169,6 @@ vboxmouse_drv_17_SOURCES = \ - # - # vboxmouse_drv_18 - # --DLLS += vboxmouse_drv_18 - vboxmouse_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_18_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local -@@ -197,7 +188,6 @@ vboxmouse_drv_18_SOURCES = \ - # - # vboxmouse_drv_19 - # --DLLS += vboxmouse_drv_19 - vboxmouse_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_19_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local -@@ -217,7 +207,6 @@ vboxmouse_drv_19_SOURCES = \ - # - # vboxmouse_drv_110 - # --DLLS += vboxmouse_drv_110 - vboxmouse_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD - vboxmouse_drv_110_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC - ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local -@@ -234,6 +224,14 @@ vboxmouse_drv_110_SOURCES = \ - vboxmouse_15.c - - -+vboxmouse_drv_$(XSERVER_VERSION)_NAME := vboxmouse_drv -+vboxmouse_drv_$(XSERVER_VERSION)_INCS := \ -+ /usr/include/x11 \ -+ /usr/include/xorg \ -+ /usr/include/pixman-1 -+DLLS += vboxmouse_drv_$(XSERVER_VERSION) -+ -+ - # Check the undefined symbols in the X.Org modules against lists of allowed - # symbols. Not very elegant, but it will catch problems early. - ifdef VBOX_WITH_TESTCASES -diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk ---- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk -+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk -@@ -22,7 +22,6 @@ include $(KBUILD_PATH)/subheader.kmk - # vboxvideo_drv - # - if1of ($(KBUILD_TARGET), linux) -- SYSMODS += vboxvideo_drv - endif # target linux - vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD - vboxvideo_drv_DEFS.linux = linux -@@ -89,7 +88,6 @@ endif # target linux - # base keywords instead of using .solaris or .linux. - # Also it is *important* to use := and not = when deriving a property. - # --DLLS += vboxvideo_drv_70 - vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD - if1of ($(KBUILD_TARGET), linux) - vboxvideo_drv_70_CFLAGS += \ -@@ -112,7 +110,6 @@ vboxvideo_drv_70_SOURCES = $(vboxvideo_drv_SOURCES) - # - # vboxvideo_drv_71 - # --DLLS += vboxvideo_drv_71 - vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS) -@@ -127,7 +124,6 @@ vboxvideo_drv_71_SOURCES = $(vboxvideo_drv_SOURCES) - # - # vboxvideo_drv_13 - # --DLLS += vboxvideo_drv_13 - vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS) VBOXVIDEO_13 -@@ -146,7 +142,6 @@ vboxvideo_drv_13_SOURCES = \ - # - # vboxvideo_drv_14 - # --DLLS += vboxvideo_drv_14 - vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_14_DEFS := $(vboxvideo_drv_13_DEFS) -@@ -165,7 +160,6 @@ vboxvideo_drv_14_SOURCES = $(vboxvideo_drv_13_SOURCES) - # - # vboxvideo_drv_15 - # --DLLS += vboxvideo_drv_15 - vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_15_DEFS := $(vboxvideo_drv_13_DEFS) NO_ANSIC PCIACCESS \ -@@ -192,7 +186,6 @@ endif - # - # vboxvideo_drv_16 - # --DLLS += vboxvideo_drv_16 - vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_16_DEFS := $(vboxvideo_drv_15_DEFS) -@@ -212,7 +205,6 @@ vboxvideo_drv_16_SOURCES := $(vboxvideo_drv_15_SOURCES) - # - # vboxvideo_drv_17 - # --DLLS += vboxvideo_drv_17 - vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS) -@@ -239,7 +231,6 @@ vboxvideo_drv_17_SOURCES := $(vboxvideo_drv_15_SOURCES) - # - # vboxvideo_drv_18 - # --DLLS += vboxvideo_drv_18 - vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_18_DEFS := $(vboxvideo_drv_15_DEFS) -@@ -266,7 +257,6 @@ vboxvideo_drv_18_SOURCES := $(vboxvideo_drv_15_SOURCES) - # - # vboxvideo_drv_19 - # --DLLS += vboxvideo_drv_19 - vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_19_DEFS := $(vboxvideo_drv_15_DEFS) -@@ -293,7 +282,6 @@ vboxvideo_drv_19_SOURCES := $(vboxvideo_drv_15_SOURCES) - # - # vboxvideo_drv_110 - # --DLLS += vboxvideo_drv_110 - vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD - vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS) - vboxvideo_drv_110_DEFS := $(vboxvideo_drv_15_DEFS) -@@ -317,6 +306,23 @@ vboxvideo_drv_110_INCS = \ - vboxvideo_drv_110_SOURCES := $(vboxvideo_drv_15_SOURCES) - - -+vboxvideo_drv_$(XSERVER_VERSION)_NAME := vboxvideo_drv -+vboxvideo_drv_$(XSERVER_VERSION)_INCS := \ -+ /usr/include/xorg \ -+ /usr/include/x11 \ -+ /usr/include/pixman-1 \ -+ /usr/include/X11/dri \ -+ /usr/include/drm \ -+ /usr/include/libdrm -+vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(PATH_ROOT)/src/VBox/Runtime/include -+DLLS += vboxvideo_drv_$(XSERVER_VERSION) -+ -+# required for lenny backports -+ifeq ($(XSERVER_VERSION),14) -+ vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(VBOX_PATH_X11_XORG_1_4)/xorg -+endif -+ -+ - # Check the undefined symbols in the X.Org modules against lists of allowed - # symbols. Not very elegant, but it will catch problems early. - ifdef VBOX_WITH_TESTCASES diff --git a/community-testing/virtualbox/60-vboxguest.rules b/community-testing/virtualbox/60-vboxguest.rules deleted file mode 100644 index 6285f7249..000000000 --- a/community-testing/virtualbox/60-vboxguest.rules +++ /dev/null @@ -1,2 +0,0 @@ -ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600" -ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666" diff --git a/community-testing/virtualbox/LocalConfig.kmk b/community-testing/virtualbox/LocalConfig.kmk deleted file mode 100644 index d0e939ad4..000000000 --- a/community-testing/virtualbox/LocalConfig.kmk +++ /dev/null @@ -1,19 +0,0 @@ -VBOX_WITH_ADDITION_DRIVERS = -VBOX_WITH_INSTALLER = 1 -VBOX_WITH_LINUX_ADDITIONS = 1 -VBOX_WITH_X11_ADDITIONS = 1 -VBOX_WITH_TESTCASES = -VBOX_WITH_TESTSUITE = -VBOX_WITH_ORIGIN := -VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox -VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH) -VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH) -VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox -VBOX_PATH_APP_DOCS := /usr/share/virtualbox -VBOX_WITH_REGISTRATION_REQUEST = -VBOX_WITH_UPDATE_REQUEST = -VBOX_WITH_VNC := 1 -VBOX_BLD_PYTHON = python2 -VBOX_JAVA_HOME = /opt/java -VBOX_GCC_WERR = -VBOX_GCC_WARN = diff --git a/community-testing/virtualbox/PKGBUILD b/community-testing/virtualbox/PKGBUILD deleted file mode 100644 index d989f61e0..000000000 --- a/community-testing/virtualbox/PKGBUILD +++ /dev/null @@ -1,217 +0,0 @@ -# $Id: PKGBUILD 47272 2011-05-20 17:46:19Z ibiru $ -#Maintainer: Ionut Biru -pkgbase=virtualbox -pkgname=('virtualbox' 'virtualbox-guest-additions' 'virtualbox-guest-modules' 'virtualbox-sdk') -pkgver=4.0.8 -pkgrel=3 -arch=('i686' 'x86_64') -url='http://virtualbox.org' -license=('GPL' 'custom') -makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libxcursor' 'qt' 'libidl2' 'sdl_ttf' 'alsa-lib' 'libpulse' 'libxtst' -'xalan-c' 'sdl' 'libxmu' 'curl' 'python2' 'kernel26-headers>=2.6.38' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'jdk' 'gsoap' 'vde2' -'xorg-server-devel' 'xf86driproto' 'libxcomposite') -[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') -source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 - http://download.virtualbox.org/virtualbox/${pkgver}/UserManual.pdf - virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch - 10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh - 18-system-xorg.patch - change_default_driver_dir.patch) -_kernver=2.6.39-ARCH - -build() { - cd "$srcdir/VirtualBox-${pkgver}_OSE" - - patch -Np1 -i "$srcdir/virtualbox-4-makeself-check.patch" - patch -Np1 -i "$srcdir/virtualbox-4-mkisofs-check.patch" - patch -Np1 -i "$srcdir/vboxdrv-reference.patch" - patch -Np1 -i "$srcdir/18-system-xorg.patch" - patch -Np1 -i "$srcdir/change_default_driver_dir.patch" - - cp "$srcdir/LocalConfig.kmk" . - - ./configure --disable-docs \ - --enable-webservice \ - --enable-vde \ - --with-linux=/usr/src/linux-${_kernver} - source ./env.sh - kmk all - - export KERN_DIR=/usr/src/linux-${_kernver} - make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" - make -C "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src/vboxvideo" - sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py" -} - -package_virtualbox() { - pkgdesc="Powerful x86 virtualization for enterprise as well as home use" - depends=('libxml2' 'libxcursor' 'libidl2' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng' 'kernel26-headers' 'gcc' 'make') - optdepends=('libxt: for shared clipboard' - 'python2: for python support' - 'qt: for VirtualBox GUI' - 'vde2: Virtual Distributed Ethernet support' - 'virtualbox-sdk: developer kit') - - replaces=('virtualbox-ose') - conflicts=('virtualbox-ose') - install=virtualbox.install - - source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" - - cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin" - mkdir -p "$pkgdir"/usr/{bin,lib/virtualbox/components,lib/virtualbox/ExtensionPacks,share/virtualbox/nls} - - #doc - install -m 0644 "$srcdir/UserManual.pdf" "$pkgdir/usr/share/virtualbox/UserManual.pdf" - - #Binaries and Wrapper with Launchers - install -m 0755 VBox.sh "$pkgdir/usr/bin/VBox" - ln -sf VBox "$pkgdir/usr/bin/VBoxHeadless" - ln -sf VBox "$pkgdir/usr/bin/vboxheadless" - ln -sf VBox "$pkgdir/usr/bin/VBoxManage" - ln -sf VBox "$pkgdir/usr/bin/vboxmanage" - ln -sf VBox "$pkgdir/usr/bin/VBoxSDL" - ln -sf VBox "$pkgdir/usr/bin/vboxsdl" - ln -sf VBox "$pkgdir/usr/bin/VirtualBox" - ln -sf VBox "$pkgdir/usr/bin/virtualbox" - ln -sf VBox "$pkgdir/usr/bin/vboxwebsrv" - - install -m 0755 VBoxTunctl "$pkgdir/usr/bin" - - #components - install -m 0755 components/* -t "$pkgdir/usr/lib/virtualbox/components" - - #lib - install -m 0755 *.so "$pkgdir/usr/lib/virtualbox" - install -m 0644 *.gc *.r0 VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox" - - #setuid root binaries - install -m 4755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl -t "$pkgdir/usr/lib/virtualbox" - #other binaries - install -m 0755 VBoxManage VBoxSVC VBoxExtPackHelperApp VBoxXPCOMIPCD VBoxTestOGL vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox" - - #language - install -m 0755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls" - - #useless scripts - install -m 0755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t "$pkgdir/usr/share/virtualbox" - - #icons - install -D -m 0644 VBox.png "$pkgdir/usr/share/pixmaps/VBox.png" - - pushd icons - for i in *; do - install -d "$pkgdir/usr/share/icons/hicolor/$i/mimetypes" - cp $i/* "$pkgdir/usr/share/icons/hicolor/$i/mimetypes" - done - popd - - #desktop - install -D -m 0644 virtualbox.desktop "$pkgdir/usr/share/applications/virtualbox.desktop" - install -D -m 0644 virtualbox.xml "$pkgdir/usr/share/mime/packages/virtualbox.xml" - - #install configuration - mkdir -p "$pkgdir/etc/vbox" - echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg" - - #udev and licence - install -D -m 0644 "$srcdir/VirtualBox-${pkgver}_OSE/COPYING" \ - "$pkgdir/usr/share/licenses/virtualbox/LICENSE" - install -D -m 0644 "$srcdir/10-vboxdrv.rules" \ - "$pkgdir/lib/udev/rules.d/10-vboxdrv.rules" - - #sources for modules - cp -r src ${pkgdir}/usr/lib/virtualbox - #install compilation script - install -D -m 755 "${srcdir}/vboxdrv.sh" "${pkgdir}/etc/rc.d/vboxdrv" -} - -package_virtualbox-sdk() { - pkgdesc=" VirtualBox Software Developer Kit (SDK)" - - mkdir -p "$pkgdir/usr/lib/virtualbox" - - source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" - cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin" - - install -D -m 0755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py" - #python sdk - pushd sdk/installer - VBOX_INSTALL_PATH="/usr/lib/virtualbox" python2 vboxapisetup.py install --root "${pkgdir}" - popd - rm -rf sdk/installer - mv sdk "$pkgdir/usr/lib/virtualbox" -} -package_virtualbox-guest-additions(){ - pkgdesc="VirtualBox user-space tools for Linux guests" - depends=("virtualbox-guest-modules=$pkgver" 'gcc-libs' 'libxmu' 'xorg-xrandr') - replaces=('virtualbox-ose-additions') - conflicts=('virtualbox-ose-additions') - - source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" - - cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions" - - install -d "$pkgdir/usr/bin" - install -d "$pkgdir/sbin" - install -m755 VBoxClient VBoxControl VBoxService "$pkgdir/usr/bin" - install -m755 mount.vboxsf "$pkgdir/sbin" - - install -m644 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/50-vboxmouse.conf \ - "$pkgdir"/etc/X11/xorg.conf.d/50-vboxmouse.conf - install -m644 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/linux/installer/70-xorg-vboxmouse.rules \ - "$pkgdir"/lib/udev/rules.d/70-xorg-vboxmouse.rules - install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/98vboxadd-xclient \ - "$pkgdir"/usr/bin/VBoxClient-all - install -m755 -D "$srcdir"/VirtualBox-${pkgver}_OSE/src/VBox/Additions/x11/Installer/vboxclient.desktop \ - "$pkgdir"/etc/xdg/autostart/vboxclient.desktop - install -D vboxmouse_drv.so \ - "$pkgdir/usr/lib/xorg/modules/input/vboxmouse.so" - install -D vboxvideo_drv.so \ - "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so" - install -d "$pkgdir/usr/lib/xorg/modules/dri" - install -m755 VBoxOGL*.so "$pkgdir/usr/lib" - ln -s /usr/lib/VBoxOGL.so "$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so" - install -m755 -D pam_vbox.so "$pkgdir/lib/security/pam_vbox.so" - -} -package_virtualbox-guest-modules(){ - pkgdesc="VirtualBox kernel modules for Linux guests" - license=('GPL') - install=virtualbox-guest-modules.install - depends=('kernel26>=2.6.39' 'kernel26<2.6.40') - replaces=('virtualbox-ose-additions-modules') - conflicts=('virtualbox-ose-additions-modules') - - source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh" - - cd "$srcdir/VirtualBox-${pkgver}_OSE/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions/src" - - cd vboxguest - install -D -m644 vboxguest.ko \ - "$pkgdir/lib/modules/$_kernver/misc/vboxguest.ko" - - cd ../vboxsf - install -D -m644 vboxsf.ko \ - "$pkgdir/lib/modules/$_kernver/misc/vboxsf.ko" - - cd ../vboxvideo - install -D -m644 vboxvideo.ko \ - "$pkgdir/lib/modules/$_kernver/misc/vboxvideo.ko" - - install -D -m 0644 "$srcdir/60-vboxguest.rules" \ - "$pkgdir/lib/udev/rules.d/60-vboxguest.rules" - - sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" "$startdir/virtualbox-guest-modules.install" -} -md5sums=('a3e81289f2357fcf4bbe3e77805f38b6' - '39712ccbc16b04c1cda209ae16446bf2' - '44efb3c4be214daa453a317d527f1f30' - '32a232b43852b9a08cb11a7bcd64b347' - '5f85710e0b8606de967716ded7b2d351' - 'ed1341881437455d9735875ddf455fbe' - '9bde5b7dfba5abcd49768052c5409800' - 'c1a07f044c476a190af8486fe78bee0f' - '47da2e88de582bb2bab14580a3aa47b1' - '8a22b33c9dfaf8fb79bb2d26304e650b' - 'ac43f7cf44b934d8dbdbc3bb6f7879ad') diff --git a/community-testing/virtualbox/change_default_driver_dir.patch b/community-testing/virtualbox/change_default_driver_dir.patch deleted file mode 100644 index 71930f062..000000000 --- a/community-testing/virtualbox/change_default_driver_dir.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -Nur VirtualBox-4.0.8_OSE.orig//src/VBox/Additions/common/crOpenGL/fakedri_drv.c VirtualBox-4.0.8_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c ---- VirtualBox-4.0.8_OSE.orig//src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2011-05-18 04:28:14.545495222 -0700 -+++ VirtualBox-4.0.8_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2011-05-18 04:29:57.945499707 -0700 -@@ -36,13 +36,8 @@ - //#define DEBUG_DRI_CALLS - - //@todo this could be different... --#ifdef RT_ARCH_AMD64 --# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri" -+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri" - # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" --#else --# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri" --# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/" --#endif - - #ifdef DEBUG_DRI_CALLS - #define SWDRI_SHOWNAME(pext, func) \ diff --git a/community-testing/virtualbox/vboxdrv-reference.patch b/community-testing/virtualbox/vboxdrv-reference.patch deleted file mode 100644 index e7a9179a9..000000000 --- a/community-testing/virtualbox/vboxdrv-reference.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -Nur VirtualBox-4.0.6_OSE.orig//src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.0.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp ---- VirtualBox-4.0.6_OSE.orig//src/VBox/Frontends/VirtualBox/src/main.cpp 2011-04-21 03:31:05.000000000 -0700 -+++ VirtualBox-4.0.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-04-21 11:10:00.503832646 -0700 -@@ -75,9 +75,8 @@ - "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or " - "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel " - "module by executing

" -- " '/etc/init.d/vboxdrv setup'

" -- "as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS " -- "package first. This package keeps track of Linux kernel changes and " -+ " '/etc/rc.d/vboxdrv setup'

" -+ "as root. This package keeps track of Linux kernel changes and" - "recompiles the vboxdrv kernel module if necessary." - ); - -@@ -92,7 +91,7 @@ - "The VirtualBox kernel modules do not match this version of " - "VirtualBox. The installation of VirtualBox was apparently not " - "successful. Executing

" -- " '/etc/init.d/vboxdrv setup'

" -+ " '/etc/rc.d/vboxdrv setup'

" - "may correct this. Make sure that you do not mix the " - "OSE version and the PUEL version of VirtualBox." - ); -diff -Nur VirtualBox-4.0.6_OSE.orig//src/VBox/Installer/linux/VBox.sh VirtualBox-4.0.6_OSE/src/VBox/Installer/linux/VBox.sh ---- VirtualBox-4.0.6_OSE.orig//src/VBox/Installer/linux/VBox.sh 2011-04-21 03:31:18.000000000 -0700 -+++ VirtualBox-4.0.6_OSE/src/VBox/Installer/linux/VBox.sh 2011-04-21 11:10:00.503832646 -0700 -@@ -34,7 +34,7 @@ - available for the current kernel (`uname -r`) or it failed to - load. Please recompile the kernel module and install it by - -- sudo /etc/init.d/vboxdrv setup -+ /etc/rc.d/vboxdrv setup - - You will not be able to start VMs until this problem is fixed. - EOF -@@ -42,7 +42,7 @@ - cat << EOF - WARNING: The character device /dev/vboxdrv does not exist. Try - -- sudo /etc/init.d/vboxdrv restart -+ /etc/rc.d/vboxdrv restart - - and if that is not successful, try to re-install the package. - diff --git a/community-testing/virtualbox/vboxdrv.sh b/community-testing/virtualbox/vboxdrv.sh deleted file mode 100755 index 8de14b97f..000000000 --- a/community-testing/virtualbox/vboxdrv.sh +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/vbox/vbox.cfg - -MODLIST=() -LOG="/var/log/vbox-install.log" - -if [ -n "$INSTALL_DIR" ]; then - VBOXMANAGE="$INSTALL_DIR/VBoxManage" - BUILDVBOXDRV="$INSTALL_DIR/src/vboxdrv/build_in_tmp" - BUILDVBOXNETFLT="$INSTALL_DIR/src/vboxnetflt/build_in_tmp" - BUILDVBOXNETADP="$INSTALL_DIR/src/vboxnetadp/build_in_tmp" -else - echo "missing vbox.cfg" - exit 0 -fi - -case "$1" in - setup) - stat_busy "Unloading VirtualBox kernel modules" - for module in vbox{netflt,netadp,drv}; do - if grep -q "^${module}" /proc/modules; then - MODLIST+=($module) - modprobe -r $module - fi - done - stat_done - for p in /lib/modules/*; do - if [ ! -d "$p/kernel" ]; then - if [ -e "$p/misc/vboxdrv.ko" ]; then - stat_busy "Removing old VirtualBox kernel modules from $p" - rm -f "$p/misc/vbox"{drv,netadp,netflt}.ko 2>/dev/null - rmdir -p --ignore-fail-on-non-empty "$p/misc/" 2>/dev/null - stat_done - fi - fi - done - if find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|grep -q vboxnetadp; then - stat_busy "Removing old VirtualBox netadp kernel module" - find /lib/modules/`uname -r` -name "vboxnetadp\.*" 2>/dev/null|xargs rm -f 2>/dev/null - stat_done - fi - if find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|grep -q vboxnetflt; then - stat_busy "Removing old VirtualBox netflt kernel module" - find /lib/modules/`uname -r` -name "vboxnetflt\.*" 2>/dev/null|xargs rm -f 2>/dev/null - stat_done - fi - if find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then - stat_busy "Removing old VirtualBox kernel module" - find /lib/modules/`uname -r` -name "vboxdrv\.*" 2>/dev/null|xargs rm -f 2>/dev/null - stat_done - fi - stat_busy "Recompiling VirtualBox kernel modules" - if ! $BUILDVBOXDRV \ - --save-module-symvers /tmp/vboxdrv-Module.symvers \ - --no-print-directory install > $LOG 2>&1; then - echo "Look at $LOG to find out what went wrong" - fi - if ! $BUILDVBOXNETFLT \ - --use-module-symvers /tmp/vboxdrv-Module.symvers \ - --no-print-directory install >> $LOG 2>&1; then - echo "Look at $LOG to find out what went wrong" - fi - if ! $BUILDVBOXNETADP \ - --use-module-symvers /tmp/vboxdrv-Module.symvers \ - --no-print-directory install >> $LOG 2>&1; then - echo "Look at $LOG to find out what went wrong" - fi - stat_done - stat_busy "Reloading VirtualBox kernel modules" - for module in "${MODLIST[@]}"; do - modprobe $module - done - stat_done - ;; - *) - echo "usage: $0 {setup}" -esac diff --git a/community-testing/virtualbox/virtualbox-4-makeself-check.patch b/community-testing/virtualbox/virtualbox-4-makeself-check.patch deleted file mode 100644 index e1fcb8c2f..000000000 --- a/community-testing/virtualbox/virtualbox-4-makeself-check.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- VirtualBox-4.0.0_OSE/configure -+++ VirtualBox-4.0.0_OSE/configure -@@ -2527,7 +2527,6 @@ - check_compiler_h - [ "$BUILD_MACHINE" = "amd64" -a $WITH_VMMRAW -eq 1 ] && check_32bit - # tools/common/makeself* -- [ $OSE -ge 1 ] && check_makeself - fi - - [ -n "$SETUP_WINE" ] && setup_wine diff --git a/community-testing/virtualbox/virtualbox-4-mkisofs-check.patch b/community-testing/virtualbox/virtualbox-4-mkisofs-check.patch deleted file mode 100644 index 8b0d59123..000000000 --- a/community-testing/virtualbox/virtualbox-4-mkisofs-check.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- VirtualBox-4.0.0_OSE/configure -+++ VirtualBox-4.0.0_OSE/configure -@@ -2499,7 +2499,6 @@ - # don't check for yasm for the time beeing as 0.40 and 0.50 both have known bugs - # [ "$OS" != "darwin" ] && check_yasm - [ "$OS" != "darwin" ] && check_xsltproc --[ "$OS" != "darwin" ] && check_mkisofs - - # the libraries - [ "$OS" != "darwin" ] && check_pthread diff --git a/community-testing/virtualbox/virtualbox-guest-modules.install b/community-testing/virtualbox/virtualbox-guest-modules.install deleted file mode 100644 index ae05bd1ba..000000000 --- a/community-testing/virtualbox/virtualbox-guest-modules.install +++ /dev/null @@ -1,24 +0,0 @@ -KERNEL_VERSION='2.6.39-ARCH' - -post_install() { - cat << EOM - -===> virtualbox-guest-modules post-install message: -===> -===> You may want to load vboxguest, vboxsf and vboxvideo -===> -===> To load them automatically, add them -===> to the MODULES array in /etc/rc.conf. - -EOM - - depmod -v $KERNEL_VERSION >/dev/null 2>&1 -} - -post_remove() { - depmod -v $KERNEL_VERSION >/dev/null 2>&1 -} - -post_upgrade() { - depmod -v $KERNEL_VERSION >/dev/null 2>&1 -} diff --git a/community-testing/virtualbox/virtualbox.install b/community-testing/virtualbox/virtualbox.install deleted file mode 100644 index e70757685..000000000 --- a/community-testing/virtualbox/virtualbox.install +++ /dev/null @@ -1,65 +0,0 @@ -utils() { - if [ -x usr/bin/update-mime-database ]; then - update-mime-database usr/share/mime > /dev/null 2>&1 - fi - - if [ -x usr/bin/xdg-icon-resource ]; then - xdg-icon-resource forceupdate --theme hicolor > /dev/null 2>&1 - fi - - if [ -x usr/bin/update-desktop-database ]; then - usr/bin/update-desktop-database -q - fi -} - -post_install() { - getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers - /bin/cat << EOF - -===> In order to run VirtualBox, you have to be in the 'vboxusers' group. -===> -===> If you want to be able to install guest additions, you have to install -===> 'virtualbox-additions' package. -===> -===> You must load vboxdrv module before starting VirtualBox: -===> # modprobe vboxdrv -===> -===> You must load vboxnetflt for Host Interface Networking: -===> # modprobe vboxnetflt -===> -===> You must load vboxnetadp for Host-Only networking: -===> # modprobe vboxnetadp -===> -===> To load it automatically, add vboxdrv module -===> to the MODULES array in /etc/rc.conf. - -*** To compile the modules do /etc/rc.d/vboxdrv setup *** - -EOF - utils -} - -post_upgrade() { - getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers - /bin/cat << EOF -===> You must reload vboxdrv module before starting VirtualBox: -===> # modprobe vboxdrv -===> -===> You must reload vboxnetflt for Host Interface Networking: -===> # modprobe vboxnetflt -===> -===> You must reload vboxnetadp for Host-Only networking: -===> # modprobe vboxnetadp -===> -===> To load it automatically, add vboxdrv module -===> to the MODULES array in /etc/rc.conf. - -*** To recompile the modules do /etc/rc.d/vboxdrv setup *** -EOF - utils -} - -post_remove() { - groupdel vboxusers >/dev/null 2>&1 || true - utils -} -- cgit v1.2.3-54-g00ecf