summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-08-08 15:16:32 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2012-08-08 15:16:32 -0300
commitc0ab07a46baec1e3096ce79eaf77766ef8c3a883 (patch)
treefd4a84c4ba62a0186f99c86d72962e0d018b4395
parent9bb78d53ceba7b16ef8374b20c4ed662e34b789c (diff)
virtualbox-libre-4.1.18-5: updating release due that was fixed some parts on PKGBUILD and vboxweb.conf
-rw-r--r--libre/virtualbox-libre/.directory3
-rw-r--r--libre/virtualbox-libre/PKGBUILD50
-rw-r--r--libre/virtualbox-libre/vboxweb.conf12
3 files changed, 37 insertions, 28 deletions
diff --git a/libre/virtualbox-libre/.directory b/libre/virtualbox-libre/.directory
index 0de6ba6b0..502696f2f 100644
--- a/libre/virtualbox-libre/.directory
+++ b/libre/virtualbox-libre/.directory
@@ -1,3 +1,4 @@
[Dolphin]
-Timestamp=2012,7,26,5,49,47
+Timestamp=2012,8,8,14,52,43
+Version=3
ViewMode=2
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index c3aa1a69c..4ce796476 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -1,9 +1,9 @@
# $Id$
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
# Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
+# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
pkgbase=virtualbox-libre
pkgname=('virtualbox-libre'
'virtualbox-libre-parabola-additions'
@@ -11,7 +11,7 @@ pkgname=('virtualbox-libre'
'virtualbox-libre-source'
'virtualbox-libre-parabola-source')
pkgver=4.1.18
-pkgrel=4.2
+pkgrel=5
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
@@ -33,7 +33,7 @@ _extramodules=extramodules-3.5-LIBRE
_kernver="$(cat /usr/lib/modules/${_extramodules}/version)" || true
build() {
- cd "$srcdir/VirtualBox-${pkgver}"
+ cd "VirtualBox-$pkgver"
patch -Np1 -i "$srcdir/vboxdrv-reference.patch"
patch -Np1 -i "$srcdir/change_default_driver_dir.patch"
@@ -72,6 +72,10 @@ build() {
source ./env.sh
kmk all
sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py"
+ # build rdesktop-vrdp (broken from LocalConfig.kmk)
+ cd src/VBox/RDP/client
+ cp "$srcdir/LocalConfig.kmk" .
+ kmk all
}
package_virtualbox-libre() {
@@ -83,25 +87,26 @@ package_virtualbox-libre() {
'virtualbox-libre-source: host kernel source modules for non-stock kernels'
'net-tools: for host-only or bridged networking')
- backup=('etc/vbox/vbox.cfg')
+ backup=('etc/vbox/vbox.cfg' 'etc/conf.d/vboxweb')
replaces=('virtualbox' 'virtualbox-ose')
conflicts=('virtualbox' 'virtualbox-ose')
provides=("virtualbox=$pkgver")
install=virtualbox-libre.install
- source "$srcdir/VirtualBox-${pkgver}/env.sh"
-
- cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
- install -dm755 "$pkgdir"/usr/{bin,lib/virtualbox/components,share/virtualbox/nls}
+ source "VirtualBox-$pkgver/env.sh"
+ cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
+ install -dm755 "$pkgdir"/usr/{bin,lib/virtualbox/components,share/virtualbox/nls,share/virtualbox/rdesktop-vrdp-keymaps}
#Binaries and Wrapper with Launchers
install -m 0755 VBox.sh "$pkgdir/usr/bin/VBox"
- for i in VBoxHeadless vboxheadless VBoxManage vboxmanage VBoxSDL vboxsdl VirtualBox virtualbox vboxwebsrv VBoxBalloonCtrl vboxballoonctrl; do
+ for i in VBoxHeadless VBoxManage VBoxSDL VirtualBox vboxwebsrv VBoxBalloonCtrl; do
ln -sf VBox "$pkgdir/usr/bin/$i"
+ ln -sf VBox "$pkgdir/usr/bin/${i,,}"
done
install -m 0755 VBoxTunctl "$pkgdir/usr/bin"
+ install -m 0755 rdesktop-vrdp "$pkgdir/usr/bin"
#components
install -m 0755 components/* -t "$pkgdir/usr/lib/virtualbox/components"
@@ -118,6 +123,9 @@ package_virtualbox-libre() {
#language
install -m 0755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls"
+ #rdesktop keymaps
+ install -m 0644 rdesktop-vrdp-keymaps/* "$pkgdir/usr/share/virtualbox/rdesktop-vrdp-keymaps"
+
#useless scripts
install -m 0755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t "$pkgdir/usr/share/virtualbox"
@@ -166,8 +174,8 @@ package_virtualbox-libre-source() {
install=virtualbox-libre-source.install
install -dm755 "$pkgdir/var/lib/dkms/vboxhost/$pkgver"
- source "$srcdir/VirtualBox-${pkgver}/env.sh"
- cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
+ source "VirtualBox-$pkgver/env.sh"
+ cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
cp -r src "$pkgdir/var/lib/dkms/vboxhost/$pkgver/source"
}
@@ -180,8 +188,8 @@ package_virtualbox-libre-sdk() {
install -dm755 "$pkgdir/usr/lib/virtualbox"
- source "$srcdir/VirtualBox-${pkgver}/env.sh"
- cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
+ source "VirtualBox-$pkgver/env.sh"
+ cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
install -D -m 0755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py"
#python sdk
@@ -201,17 +209,17 @@ package_virtualbox-libre-parabola-additions(){
backup=('etc/conf.d/vboxservice')
install=virtualbox-libre-parabola-additions.install
- source "$srcdir/VirtualBox-${pkgver}/env.sh"
+ source "VirtualBox-$pkgver/env.sh"
- cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
+ cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
install -d "$pkgdir"/{usr/bin,sbin}
install -m755 VBoxClient VBoxControl VBoxService "$pkgdir/usr/bin"
install -m755 mount.vboxsf "$pkgdir/sbin"
- install -m755 -D "$srcdir"/VirtualBox-${pkgver}/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
+ install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
"$pkgdir"/usr/bin/VBoxClient-all
- install -m755 -D "$srcdir"/VirtualBox-${pkgver}/src/VBox/Additions/x11/Installer/vboxclient.desktop \
+ install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/vboxclient.desktop \
"$pkgdir"/etc/xdg/autostart/vboxclient.desktop
install -D vboxvideo_drv_112.so \
"$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so"
@@ -242,8 +250,8 @@ package_virtualbox-libre-parabola-source() {
install=virtualbox-libre-parabola-source.install
install -dm755 "$pkgdir/var/lib/dkms/vboxguest/$pkgver"
- source "$srcdir/VirtualBox-${pkgver}/env.sh"
- cd "$srcdir/VirtualBox-${pkgver}/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
+ source "VirtualBox-$pkgver/env.sh"
+ cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
cp -r src "$pkgdir/var/lib/dkms/vboxguest/$pkgver/source"
}
@@ -256,7 +264,7 @@ md5sums=('38db0a87cba659b484af868b0c2bd3ac'
'3c08ad30b89add47d3f45121200a5360'
'7d9823507206de9b8528a72af2f18d74'
'07c5f6d86c4b7839d719c8ee0c53653b'
- '3ac185709bfe688bb753c46e170d0546'
+ '7e9483b1069a54f181546083ac7e5469'
'c159d683ba1947290fc2ad2c64194150'
'bc9efed88e0469cd7fc460d5a5cd7b4b'
'8538dba8686d7449cb481c9bae9d722a'
diff --git a/libre/virtualbox-libre/vboxweb.conf b/libre/virtualbox-libre/vboxweb.conf
index 49d82d828..c36f6a143 100644
--- a/libre/virtualbox-libre/vboxweb.conf
+++ b/libre/virtualbox-libre/vboxweb.conf
@@ -3,9 +3,9 @@
# WebService Variables
#VBOXWEB_LOGFILE=
-#$VBOXWEB_HOST=
-#$VBOXWEB_PORT=
-#$VBOXWEB_TIMEOUT=
-#$VBOXWEB_CHECK_INTERVAL=
-#$VBOXWEB_THREADS=
-#$VBOXWEB_KEEPALIVE=
+#VBOXWEB_HOST=
+#VBOXWEB_PORT=
+#VBOXWEB_TIMEOUT=
+#VBOXWEB_CHECK_INTERVAL=
+#VBOXWEB_THREADS=
+#VBOXWEB_KEEPALIVE=