summaryrefslogtreecommitdiff
path: root/libre/virtualbox-libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre/virtualbox-libre')
-rw-r--r--libre/virtualbox-libre/003-gcc-48.patch39
-rw-r--r--libre/virtualbox-libre/003-linux-3.8.patch15
-rw-r--r--libre/virtualbox-libre/004-system-xorg.patch245
-rw-r--r--libre/virtualbox-libre/PKGBUILD60
-rw-r--r--libre/virtualbox-libre/free-distros.patch91
-rw-r--r--libre/virtualbox-libre/libre.patch6
-rw-r--r--libre/virtualbox-libre/vboxservice.conf2
-rw-r--r--libre/virtualbox-libre/vboxservice.rc39
-rw-r--r--libre/virtualbox-libre/vboxweb.conf11
-rw-r--r--libre/virtualbox-libre/vboxweb.rc86
-rw-r--r--libre/virtualbox-libre/virtualbox-libre-guest-dkms.install4
-rw-r--r--libre/virtualbox-libre/virtualbox-libre-host-dkms.install4
-rw-r--r--libre/virtualbox-libre/virtualbox-libre.install6
13 files changed, 382 insertions, 226 deletions
diff --git a/libre/virtualbox-libre/003-gcc-48.patch b/libre/virtualbox-libre/003-gcc-48.patch
new file mode 100644
index 000000000..3039ea2c6
--- /dev/null
+++ b/libre/virtualbox-libre/003-gcc-48.patch
@@ -0,0 +1,39 @@
+Index: configure
+===================================================================
+--- a/configure (revision 45449)
++++ a/configure (revision 45450)
+@@ -416,7 +416,7 @@
+ elif [ $cc_maj -lt 3 \
+ -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \
+ -o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \
+- -o \( $cc_maj -eq 4 -a $cc_min -gt 7 \) \
++ -o \( $cc_maj -eq 4 -a $cc_min -gt 8 \) \
+ -o $cc_maj -gt 4 ]; then
+ log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<8"
+ fail really
+Index: Config.kmk
+===================================================================
+--- a/Config.kmk (revision 45449)
++++ a/Config.kmk (revision 45450)
+@@ -1503,7 +1503,7 @@
+ #
+ # Compiler optimization flags.
+ #
+-VBOX_GCC_WARN ?= -Wall $(VBOX_GCC_Wextra) $(VBOX_GCC_Wno-missing-field-initializers) -Wno-unused -Wno-trigraphs $(VBOX_GCC_fdiagnostics-show-option)
++VBOX_GCC_WARN ?= -Wall $(VBOX_GCC_Wextra) $(VBOX_GCC_Wno-missing-field-initializers) -Wno-unused -Wno-trigraphs $(VBOX_GCC_fdiagnostics-show-option) $(VBOX_GCC_no-unused-parameter)
+ VBOX_GCC_WARN_PEDANTIC = -Wshadow $(VBOX_GCC_WARN) -Wno-long-long
+ ifdef VBOX_WITH_MASOCHISTIC_WARNINGS
+ VBOX_GCC_WARN_PEDANTIC += -Wunused-variable -Wunused-function -Wunused-label -Wunused-parameter
+@@ -2285,6 +2285,12 @@
+ $(QUIET)$(APPEND) '$@' ' endif'
+ $(QUIET)$(APPEND) '$@' 'endif'
+ endif
++# Prevent warnings about unused parameters as of gcc-4.8 as this warning is now very verbose
++ $(QUIET)$(APPEND) '$@' 'ifneq ($$(VBOX_GCC_VERSION_CXX),)'
++ $(QUIET)$(APPEND) '$@' ' ifneq ($$(int-ge $$(VBOX_GCC_VERSION_CXX),40800),)'
++ $(QUIET)$(APPEND) '$@' ' VBOX_GCC_no-unused-parameter ?= -Wno-unused-parameter'
++ $(QUIET)$(APPEND) '$@' ' endif'
++ $(QUIET)$(APPEND) '$@' 'endif'
+ ifeq ($(KBUILD_TARGET),solaris)
+ $(QUIET)$(APPEND) '$@' 'VBOX_GCC_msave-args ?= $(call VBOX_GCC_CHECK_CXX,-msave-args,)'
+ # Detect the solaris assembler. It is used by the the 4.x gcc compilers,
diff --git a/libre/virtualbox-libre/003-linux-3.8.patch b/libre/virtualbox-libre/003-linux-3.8.patch
new file mode 100644
index 000000000..0c6d9fbbf
--- /dev/null
+++ b/libre/virtualbox-libre/003-linux-3.8.patch
@@ -0,0 +1,15 @@
+--- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c (revision 43343)
++++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c (revision 44317)
+@@ -196,7 +196,11 @@
+
+
+ /** PCI hotplug structure. */
+-static const struct pci_device_id __devinitdata g_VBoxGuestPciId[] =
++static const struct pci_device_id
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
++__devinitdata
++#endif
++g_VBoxGuestPciId[] =
+ {
+ {
+ vendor: VMMDEV_VENDORID,
diff --git a/libre/virtualbox-libre/004-system-xorg.patch b/libre/virtualbox-libre/004-system-xorg.patch
new file mode 100644
index 000000000..c527f7f20
--- /dev/null
+++ b/libre/virtualbox-libre/004-system-xorg.patch
@@ -0,0 +1,245 @@
+diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/common/crOpenGL/Makefile.kmk
+--- VirtualBox-4.2.10.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-03-19 18:55:28.774951223 +0000
++++ VirtualBox-4.2.10/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2013-03-19 18:58:06.337193736 +0000
+@@ -63,18 +63,12 @@
+ 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)/libXext-1.3.1 \
+- $(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)/xextproto-7.1.1 \
+- $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
++ /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 -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
+--- VirtualBox-4.2.10.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2013-03-19 18:55:28.778284533 +0000
++++ VirtualBox-4.2.10/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000
+@@ -40,8 +40,8 @@
+ 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 -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/Makefile.kmk
+--- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/Makefile.kmk 2013-03-19 18:55:28.974949837 +0000
++++ VirtualBox-4.2.10/src/VBox/Additions/x11/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000
+@@ -17,6 +17,10 @@
+ SUB_DEPTH = ../../../..
+ include $(KBUILD_PATH)/subheader.kmk
+
++ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110 111)
++ XSERVER_VERSION := 17
++endif
++
+ # Include sub-makefiles.
+ if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
+ include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
+diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxmouse/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
+--- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2013-03-19 18:55:28.818284256 +0000
++++ VirtualBox-4.2.10/src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000
+@@ -29,7 +29,6 @@
+ # vboxmouse_drv
+ #
+ if1of ($(KBUILD_TARGET), linux)
+- SYSMODS += vboxmouse_drv
+ vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD
+ vboxmouse_drv_DEFS.linux = linux
+ vboxmouse_drv_DEFS.x86 += __i386__
+@@ -69,7 +68,6 @@
+ #
+ # 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 DONT_DEFINE_WRAPPERS NO_ANSIC
+@@ -85,7 +83,6 @@
+ #
+ # vboxmouse_drv_71
+ #
+-DLLS += vboxmouse_drv_71
+ vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+ vboxmouse_drv_71_INCS := \
+@@ -100,7 +97,6 @@
+ #
+ # 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 := \
+@@ -114,7 +110,6 @@
+ #
+ # 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 := \
+@@ -128,7 +123,6 @@
+ #
+ # 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 := \
+@@ -142,7 +136,6 @@
+ #
+ # 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 := \
+diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+--- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2013-03-19 18:55:28.974949837 +0000
++++ VirtualBox-4.2.10/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2013-03-19 18:56:00.468064457 +0000
+@@ -53,7 +53,6 @@
+ # vboxvideo_drv
+ #
+ if1of ($(KBUILD_TARGET), linux)
+- SYSMODS += vboxvideo_drv
+ endif # target linux
+ vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD
+ vboxvideo_drv_DEFS.linux = linux
+@@ -128,7 +127,6 @@
+ # 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 += \
+@@ -149,7 +147,6 @@
+ #
+ # 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_70_DEFS) XORG_VERSION_CURRENT=700100000
+@@ -164,7 +161,6 @@
+ #
+ # 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_13_DEFS) XORG_VERSION_CURRENT=100300000
+@@ -178,7 +174,6 @@
+ #
+ # 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_13_DEFS) XORG_VERSION_CURRENT=100400000
+@@ -192,7 +187,6 @@
+ #
+ # 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_15_DEFS) XORG_VERSION_CURRENT=100503000
+@@ -213,7 +207,6 @@
+ #
+ # 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_15_DEFS) XORG_VERSION_CURRENT=100600000
+@@ -227,7 +220,6 @@
+ #
+ # 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_15_DEFS) XORG_VERSION_CURRENT=100699000
+@@ -241,7 +233,6 @@
+ #
+ # 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_15_DEFS) XORG_VERSION_CURRENT=100800000
+@@ -255,7 +246,6 @@
+ #
+ # 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_15_DEFS) XORG_VERSION_CURRENT=100900000
+@@ -269,7 +259,6 @@
+ #
+ # 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_15_DEFS) XORG_VERSION_CURRENT=101000000
+@@ -283,7 +272,6 @@
+ #
+ # vboxvideo_drv_111
+ #
+-DLLS += vboxvideo_drv_111
+ vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101100000
+@@ -297,7 +285,6 @@
+ #
+ # vboxvideo_drv_112
+ #
+-DLLS += vboxvideo_drv_112
+ vboxvideo_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD
+ vboxvideo_drv_112_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
+ vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101200000
+@@ -341,6 +328,23 @@
+ endif
+
+
++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.
+
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index dc94a2a33..709edc49e 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -12,8 +12,8 @@ pkgname=('virtualbox-libre'
'virtualbox-libre-guest-dkms'
'virtualbox-libre-sdk'
'virtualbox-libre-guest-utils')
-pkgver=4.2.6
-pkgrel=1.1
+pkgver=4.2.12
+pkgrel=1
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
@@ -22,12 +22,15 @@ makedepends=('alsa-lib'
'cdrkit'
'curl'
'dev86'
+ 'device-mapper'
+ 'glu'
'gsoap'
'iasl'
'jdk7-openjdk'
'libidl2'
'libpulse'
'libstdc++5'
+ 'libxcomposite'
'libxcursor'
'libxinerama'
'libxml2'
@@ -37,26 +40,25 @@ makedepends=('alsa-lib'
'libxtst'
'linux-libre-headers'
'mesa'
- 'glu'
'python2'
- 'qt'
+ 'qt4'
'sdl'
'sdl_ttf'
'vde2'
- 'xalan-c')
+ 'xalan-c'
+ 'xf86driproto'
+ 'xorg-server-devel')
[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.tar.bz2"
'10-vboxdrv.rules'
'60-vboxguest.rules'
'LocalConfig.kmk'
- 'vboxservice.conf'
- 'vboxservice.rc'
'vboxservice.service'
- 'vboxweb.conf'
- 'vboxweb.rc'
'vboxweb.service'
'001-vboxdrv-reference.patch'
'002-change_default_driver_dir.patch'
+ '003-gcc-48.patch'
+ '004-system-xorg.patch'
'os_blag_64.png'
'os_blag.png'
'os_dragora_64.png'
@@ -77,18 +79,16 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
'os_venenux.png'
'libre.patch'
'free-distros.patch')
-md5sums=('d680aeb3b4379b8281527aeb012b2df5'
+md5sums=('654e45054ae6589452508d37403dc800'
'5f85710e0b8606de967716ded7b2d351'
'ed1341881437455d9735875ddf455fbe'
'58d6e5bb4b4c1c6f3f0b3daa6aaeed03'
- '3c08ad30b89add47d3f45121200a5360'
- '7d9823507206de9b8528a72af2f18d74'
'07c5f6d86c4b7839d719c8ee0c53653b'
- '7e9483b1069a54f181546083ac7e5469'
- 'c159d683ba1947290fc2ad2c64194150'
'bc9efed88e0469cd7fc460d5a5cd7b4b'
'f4e4c7895ede9c524109589bf16ae660'
'97e193f050574dd272a38e5ee5ebe62b'
+ '7cf8611ae5850b86323b690e430eeed7'
+ '4da461f8c90caa123b47c62479f426b4'
'8538dba8686d7449cb481c9bae9d722a'
'545c925b46f2ac95e5f8ae407fad101a'
'f6416f509c2e5460e4dc624e0a57f3c1'
@@ -107,12 +107,11 @@ md5sums=('d680aeb3b4379b8281527aeb012b2df5'
'c7951fe6888d939f3a7d0dafe477e82b'
'4da8eeb2ece7e475fc7a0d1003da26c6'
'5e4187af59726d71c5be48d0cd816c34'
- '05d166104a66ee479896c941ac27a3d0'
- '78168f8699aa01a632603f0d5b1b8281')
+ '919277147baae235810f1858200038c0'
+ '50387fba578646a9d29de3f917a199d2')
-build() {
+prepare() {
cd "VirtualBox-$pkgver"
-
# Apply patches
for _p in "$srcdir"/*.patch; do
[[ -e $_p ]] || continue
@@ -139,9 +138,11 @@ build() {
for i in {dynebolic,venenux,{gnu,parabola,gnewsense,blag,dragora,ututo,musix,trisquel}{,_64}}; do
cp -v "$srcdir/os_${i}.png" "./src/VBox/Frontends/VirtualBox/images"
done
+}
+build() {
+ cd "VirtualBox-$pkgver"
cp "$srcdir/LocalConfig.kmk" .
-
# fake makeself binary to compile without nofatal
ln -s /bin/echo makeself
export PATH="$CWD:$PATH"
@@ -166,7 +167,7 @@ build() {
}
package_virtualbox-libre() {
- pkgdesc='Powerful x86 virtualization for enterprise as well as home use (with free GNU/Linux distros presets and Oracle VM VirtualBox Extension Pack support removed)'
+ pkgdesc='Powerful x86 virtualization for enterprise as well as home use (with free GNU/Linux distros presets included and nonfree Oracle VM VirtualBox Extension Pack support removed)'
depends=('curl'
'libpng'
'libxcursor'
@@ -176,12 +177,12 @@ package_virtualbox-libre() {
'sdl'
'shared-mime-info'
'virtualbox-libre-host-modules')
- optdepends=('qt: VirtualBox GUI support'
+ optdepends=('qt4: VirtualBox GUI support'
'vde2: Virtual Distributed Ethernet support'
'virtualbox-libre-sdk: Developer kit'
'virtualbox-libre-host-dkms: Host kernel source modules for non-stock kernels'
'net-tools: Host-only or bridged networking support')
- backup=('etc/vbox/vbox.cfg' 'etc/conf.d/vboxweb')
+ backup=('etc/vbox/vbox.cfg')
replaces=('virtualbox' 'virtualbox-ose')
conflicts=('virtualbox' 'virtualbox-ose')
provides=("virtualbox=$pkgver")
@@ -191,7 +192,6 @@ package_virtualbox-libre() {
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"
@@ -247,14 +247,9 @@ package_virtualbox-libre() {
install -D -m 0644 "$srcdir/10-vboxdrv.rules" \
"$pkgdir/usr/lib/udev/rules.d/10-vboxdrv.rules"
- # install rc.d script
- install -D -m755 "$srcdir/vboxweb.rc" "$pkgdir/etc/rc.d/vboxweb"
# install systemd service
install -D -m644 "$srcdir/vboxweb.service" \
"$pkgdir/usr/lib/systemd/system/vboxweb.service"
- # install sample config
- install -D -m644 "$srcdir/vboxweb.conf" "$pkgdir/etc/conf.d/vboxweb"
-
}
package_virtualbox-libre-sdk() {
@@ -313,11 +308,10 @@ package_virtualbox-libre-guest-dkms() {
package_virtualbox-libre-guest-utils(){
pkgdesc='VirtualBox Guest userspace utilities'
depends=('virtualbox-libre-guest-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes')
- optdepends=('virtualbox-guest-source: Guest kernel source modules for non-stock kernels')
+ optdepends=('virtualbox-libre-guest-dkms: Guest kernel source modules for non-stock kernels')
provides=("virtualbox-guest-utils=$pkgver")
replaces=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions')
conflicts=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions')
- backup=('etc/conf.d/vboxservice')
install=virtualbox-libre-guest-utils.install
source "VirtualBox-$pkgver/env.sh"
@@ -329,7 +323,7 @@ package_virtualbox-libre-guest-utils(){
"$pkgdir"/usr/bin/VBoxClient-all
install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/vboxclient.desktop \
"$pkgdir"/etc/xdg/autostart/vboxclient.desktop
- install -D vboxvideo_drv_113.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"
@@ -339,10 +333,6 @@ package_virtualbox-libre-guest-utils(){
# install udev rules
install -D -m 0644 60-vboxguest.rules \
"$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
- # install rc.d script
- install -D -m755 vboxservice.rc "$pkgdir/etc/rc.d/vboxservice"
- # install sample config
- install -D -m644 vboxservice.conf "$pkgdir/etc/conf.d/vboxservice"
# install systemd service file
install -D -m644 vboxservice.service \
"$pkgdir/usr/lib/systemd/system/vboxservice.service"
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
index 91d15e380..913fe7039 100644
--- a/libre/virtualbox-libre/free-distros.patch
+++ b/libre/virtualbox-libre/free-distros.patch
@@ -1,8 +1,8 @@
diff --git a/src/VBox/Main/src-all/Global.cpp b/src/VBox/Main/src-all/Global.cpp
-index 6ae0372..df65e60 100644
+index 8c6ab79..1e048d9 100644
--- a/src/VBox/Main/src-all/Global.cpp
+++ b/src/VBox/Main/src-all/Global.cpp
-@@ -33,289 +33,365 @@ const Global::OSType Global::sOSTypes[] =
+@@ -33,285 +33,361 @@ const Global::OSType Global::sOSTypes[] =
VBOXOSTYPE_Unknown, VBOXOSHINT_NONE,
64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
@@ -188,10 +188,6 @@ index 6ae0372..df65e60 100644
+ VBOXOSTYPE_Dynebolic, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
+ 256, 4, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
-+ { "Free Distros", "Free GNU/Linux Distros", "Venenux", "Venenux",
-+ VBOXOSTYPE_Venenux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+ 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+ { "Non-free Distros", "Non-free GNU/Linux Distros", "ArchLinux", "Arch Linux",
VBOXOSTYPE_ArchLinux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
256, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
@@ -304,6 +300,10 @@ index 6ae0372..df65e60 100644
- { "Linux", "Linux", "Linux", "Other Linux",
- VBOXOSTYPE_Linux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
- 256, 12, 8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ { "Non-free Distros", "Non-free GNU/Linux Distros", "Venenux", "Venenux",
++ VBOXOSTYPE_Venenux, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
++ 384, 12, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
+ { "Non-free OSs", "Non-free Operating Systems", "Windows31", "Windows 3.1",
+ VBOXOSTYPE_Win31, VBOXOSHINT_FLOPPY,
+ 32, 4, 1 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
@@ -410,102 +410,106 @@ index 6ae0372..df65e60 100644
1536, 12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "BSD", "BSD", "FreeBSD", "FreeBSD",
-+ { "Non-free OSs", "Non-free Operating Systems", "FreeBSD", "FreeBSD",
++ { "Non-free OSs", "Non-free Operating Systems", "FreeBSD", "FreeBSD",
VBOXOSTYPE_FreeBSD, VBOXOSHINT_NONE,
128, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "BSD", "BSD", "FreeBSD_64", "FreeBSD (64 bit)",
-+ { "Non-free OSs", "Non-free Operating Systems", "FreeBSD_64", "FreeBSD (64 bit)",
++ { "Non-free OSs", "Non-free Operating Systems", "FreeBSD_64", "FreeBSD (64 bit)",
VBOXOSTYPE_FreeBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
128, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "BSD", "BSD", "OpenBSD", "OpenBSD",
-+ { "Non-free OSs", "Non-free Operating Systems", "OpenBSD", "OpenBSD",
++ { "Non-free OSs", "Non-free Operating Systems", "OpenBSD", "OpenBSD",
VBOXOSTYPE_OpenBSD, VBOXOSHINT_HWVIRTEX,
64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "BSD", "BSD", "OpenBSD_64", "OpenBSD (64 bit)",
-+ { "Non-free OSs", "Non-free Operating Systems", "OpenBSD_64", "OpenBSD (64 bit)",
++ { "Non-free OSs", "Non-free Operating Systems", "OpenBSD_64", "OpenBSD (64 bit)",
VBOXOSTYPE_OpenBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "BSD", "BSD", "NetBSD", "NetBSD",
-+ { "Non-free OSs", "Non-free Operating Systems", "NetBSD", "NetBSD",
++ { "Non-free OSs", "Non-free Operating Systems", "NetBSD", "NetBSD",
VBOXOSTYPE_NetBSD, VBOXOSHINT_NONE,
64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "BSD", "BSD", "NetBSD_64", "NetBSD (64 bit)",
-+ { "Non-free OSs", "Non-free Operating Systems", "NetBSD_64", "NetBSD (64 bit)",
++ { "Non-free OSs", "Non-free Operating Systems", "NetBSD_64", "NetBSD (64 bit)",
VBOXOSTYPE_NetBSD_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
64, 4, 2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "OS2", "IBM OS/2", "OS2Warp3", "OS/2 Warp 3",
-+ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp3", "OS/2 Warp 3",
++ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp3", "OS/2 Warp 3",
VBOXOSTYPE_OS2Warp3, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
48, 4, 1 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
- { "OS2", "IBM OS/2", "OS2Warp4", "OS/2 Warp 4",
-+ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp4", "OS/2 Warp 4",
++ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp4", "OS/2 Warp 4",
VBOXOSTYPE_OS2Warp4, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
- { "OS2", "IBM OS/2", "OS2Warp45", "OS/2 Warp 4.5",
-+ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp45", "OS/2 Warp 4.5",
++ { "Non-free OSs", "Non-free Operating Systems", "OS2Warp45", "OS/2 Warp 4.5",
VBOXOSTYPE_OS2Warp45, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
128, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
- { "OS2", "IBM OS/2", "OS2eCS", "eComStation",
-+ { "Non-free OSs", "Non-free Operating Systems", "OS2eCS", "eComStation",
++ { "Non-free OSs", "Non-free Operating Systems", "OS2eCS", "eComStation",
VBOXOSTYPE_ECS, VBOXOSHINT_HWVIRTEX,
256, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "OS2", "IBM OS/2", "OS2", "Other OS/2",
-+ { "Non-free OSs", "Non-free Operating Systems", "OS2", "Other OS/2",
++ { "Non-free OSs", "Non-free Operating Systems", "OS2", "Other OS/2",
VBOXOSTYPE_OS2, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB,
96, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
- { "MacOS", "Mac OS X", "MacOS", "Mac OS X",
-+ { "Non-free OSs", "Non-free Operating Systems", "MacOS", "Mac OS X",
++ { "Non-free OSs", "Non-free Operating Systems", "MacOS", "Mac OS X",
VBOXOSTYPE_MacOS, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,
2048, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0,
StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA,
ChipsetType_ICH9, AudioControllerType_HDA },
- { "MacOS", "Mac OS X", "MacOS_64", "Mac OS X (64 bit)",
-+ { "Non-free OSs", "Non-free Operating Systems", "MacOS_64", "Mac OS X (64 bit)",
++ { "Non-free OSs", "Non-free Operating Systems", "MacOS_64", "Mac OS X (64 bit)",
VBOXOSTYPE_MacOS_x64, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_64BIT | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,
2048, 4, 20 * _1G64, NetworkAdapterType_I82543GC, 0,
StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA,
ChipsetType_ICH9, AudioControllerType_HDA },
- { "Other", "Other", "DOS", "DOS",
-+ { "Non-free OSs", "Non-free Operating Systems", "DOS", "DOS",
++ { "Non-free OSs", "Non-free Operating Systems", "DOS", "DOS",
VBOXOSTYPE_DOS, VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB,
32, 4, 500 * _1M, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16 },
- { "Other", "Other", "Netware", "Netware",
-+ { "Non-free OSs", "Non-free Operating Systems", "Netware", "Netware",
++ { "Non-free OSs", "Non-free Operating Systems", "Netware", "Netware",
VBOXOSTYPE_Netware, VBOXOSHINT_HWVIRTEX,
512, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Other", "Other", "L4", "L4",
-+ { "Non-free OSs", "Non-free Operating Systems", "L4", "L4",
++ { "Non-free OSs", "Non-free Operating Systems", "L4", "L4",
VBOXOSTYPE_L4, VBOXOSHINT_NONE,
64, 4, 2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Other", "Other", "QNX", "QNX",
-+ { "Non-free OSs", "Non-free Operating Systems", "QNX", "QNX",
- VBOXOSTYPE_QNX, VBOXOSHINT_HWVIRTEX,
++ { "Non-free OSs", "Non-free Operating Systems", "QNX", "QNX",
+ #ifdef VBOX_WITH_RAW_RING1
+ VBOXOSTYPE_QNX, VBOXOSHINT_NONE,
+ #else
+@@ -319,7 +395,7 @@ const Global::OSType Global::sOSTypes[] =
+ #endif
512, 4, 4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
- { "Other", "Other", "JRockitVE", "JRockitVE",
-+ { "Non-free OSs", "Non-free Operating Systems", "JRockitVE", "JRockitVE",
++ { "Non-free OSs", "Non-free Operating Systems", "JRockitVE", "JRockitVE",
VBOXOSTYPE_JRockitVE, VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_PAE,
1024, 4, 8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97 },
diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
-index c5a4cfe..7d2b363 100644
+index b335043..59ee885 100644
--- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
-@@ -44,46 +44,33 @@ struct osTypePattern
+@@ -44,46 +44,32 @@ struct osTypePattern
static const osTypePattern gs_OSTypePattern[] =
{
@@ -573,22 +577,21 @@ index c5a4cfe..7d2b363 100644
+ { QRegExp("Tri.*64", Qt::CaseInsensitive), "Trisquel_64" },
+ { QRegExp("Tri", Qt::CaseInsensitive), "Trisquel" },
+ { QRegExp("Dyn", Qt::CaseInsensitive), "Dynebolic" },
-+ { QRegExp("Ven", Qt::CaseInsensitive), "Venenux" },
+
+ /* Code names for non-free GNU/Linux distributions: */
- { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
- { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)", Qt::CaseInsensitive), "Ubuntu" },
- { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
-@@ -91,7 +78,7 @@ static const osTypePattern gs_OSTypePattern[] =
- { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)).*64", Qt::CaseInsensitive), "Fedora_64" },
- { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)", Qt::CaseInsensitive), "Fedora" },
+ { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
+ { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)", Qt::CaseInsensitive), "Ubuntu" },
+ { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
+@@ -91,7 +77,7 @@ static const osTypePattern gs_OSTypePattern[] =
+ { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)).*64", Qt::CaseInsensitive), "Fedora_64" },
+ { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)", Qt::CaseInsensitive), "Fedora" },
- /* Regular names of Linux distributions: */
+ /* Regular names of non-free GNU/Linux distributions: */
{ QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" },
{ QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" },
{ QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" },
-@@ -116,15 +103,51 @@ static const osTypePattern gs_OSTypePattern[] =
+@@ -116,15 +102,52 @@ static const osTypePattern gs_OSTypePattern[] =
{ QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
{ QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
{ QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
@@ -599,8 +602,10 @@ index c5a4cfe..7d2b363 100644
- { QRegExp("(((Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" },
- { QRegExp("((Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" },
- { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" },
-
+-
- /* Other: */
++ { QRegExp("Ven", Qt::CaseInsensitive), "Venenux" },
++
+ /* Regular names of generic GNU, GNU/Linux and GNU-Hurd Operating Systems */
+ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" },
+ { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" },
@@ -836,10 +841,10 @@ index cbc0b73..31516cd 100644
#define VBOXOSTYPE_x64_BIT 8
/** The mask which indicates 64-bit. */
diff --git a/src/VBox/Main/src-server/ApplianceImpl.cpp b/src/VBox/Main/src-server/ApplianceImpl.cpp
-index 05fc3b6..ce24d92 100644
+index 05fc3b6..dc06073 100644
--- a/src/VBox/Main/src-server/ApplianceImpl.cpp
+++ b/src/VBox/Main/src-server/ApplianceImpl.cpp
-@@ -84,7 +84,32 @@ g_osTypes[] =
+@@ -84,7 +84,31 @@ g_osTypes[] =
{ ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS },
{ ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS_x64 }, // there is no CIM 64-bit type for this
@@ -859,7 +864,6 @@ index 05fc3b6..ce24d92 100644
+ { ovf::CIMOSType_CIMOS_Trisquel, VBOXOSTYPE_Trisquel },
+ { ovf::CIMOSType_CIMOS_Trisquel_64, VBOXOSTYPE_Trisquel_x64 },
+ { ovf::CIMOSType_CIMOS_Dynebolic, VBOXOSTYPE_Dynebolic },
-+ { ovf::CIMOSType_CIMOS_Venenux, VBOXOSTYPE_Venenux },
+
+ // Free GNU/Linux distros that we have support for but CIM doesn't
+ { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Parabola },
@@ -873,7 +877,14 @@ index 05fc3b6..ce24d92 100644
{ ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux, VBOXOSTYPE_RedHat },
{ ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64, VBOXOSTYPE_RedHat_x64 },
{ ovf::CIMOSType_CIMOS_Solaris_64, VBOXOSTYPE_Solaris_x64 },
-@@ -110,7 +135,7 @@ g_osTypes[] =
+@@ -104,13 +128,14 @@ g_osTypes[] =
+ { ovf::CIMOSType_CIMOS_Ubuntu_64, VBOXOSTYPE_Ubuntu_x64 },
+ { ovf::CIMOSType_CIMOS_Debian, VBOXOSTYPE_Debian },
+ { ovf::CIMOSType_CIMOS_Debian_64, VBOXOSTYPE_Debian_x64 },
++ { ovf::CIMOSType_CIMOS_Venenux, VBOXOSTYPE_Venenux },
+ { ovf::CIMOSType_CIMOS_Linux_2_4_x, VBOXOSTYPE_Linux24 },
+ { ovf::CIMOSType_CIMOS_Linux_2_4_x_64, VBOXOSTYPE_Linux24_x64 },
+ { ovf::CIMOSType_CIMOS_Linux_2_6_x, VBOXOSTYPE_Linux26 },
{ ovf::CIMOSType_CIMOS_Linux_2_6_x_64, VBOXOSTYPE_Linux26_x64 },
{ ovf::CIMOSType_CIMOS_Linux_64, VBOXOSTYPE_Linux26_x64 },
diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch
index e93fe80e8..a696f9a0d 100644
--- a/libre/virtualbox-libre/libre.patch
+++ b/libre/virtualbox-libre/libre.patch
@@ -681,8 +681,8 @@
ifdef VBOX_WITH_INSTALLER
include $(PATH_SUB_CURRENT)/Installer/Makefile.kmk # Keep this last.
endif
---- VirtualBox-4.1.18.orig/src/libs/Makefile.kmk 2012-07-24 21:23:26.938013023 -0300
-+++ VirtualBox-4.1.18/src/libs/Makefile.kmk 2012-07-24 21:43:42.557911752 -0300
+--- VirtualBox-4.2.12.orig/src/libs/Makefile.kmk 2013-04-12 07:39:14.000000000 -0300
++++ VirtualBox-4.2.12/src/libs/Makefile.kmk 2013-04-13 02:00:29.294392443 -0300
@@ -48,13 +48,6 @@
include $(PATH_SUB_CURRENT)/kStuff/Makefile.kmk
endif
@@ -691,7 +691,7 @@
-if !defined(VBOX_ONLY_SDK) \
- && ( "$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)" \
- || defined(VBOX_WITH_EXTPACK_PUEL_BUILD))
-- include $(PATH_SUB_CURRENT)/openssl-0.9.8t/Makefile.kmk
+- include $(PATH_SUB_CURRENT)/openssl-0.9.8y/Makefile.kmk
-endif
-
# libjpeg for VRDP video redirection
diff --git a/libre/virtualbox-libre/vboxservice.conf b/libre/virtualbox-libre/vboxservice.conf
deleted file mode 100644
index 9d4ec629f..000000000
--- a/libre/virtualbox-libre/vboxservice.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# VBoxService -h
-VBOX_SERVICE_OPTION=""
diff --git a/libre/virtualbox-libre/vboxservice.rc b/libre/virtualbox-libre/vboxservice.rc
deleted file mode 100644
index 5a62d69a3..000000000
--- a/libre/virtualbox-libre/vboxservice.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/${0##*/}
-
-name=VBoxService
-PID=$(pidof -o %PPID $name)
-
-case "$1" in
- start)
- stat_busy 'Starting VirtualBox Guest Service'
- [[ -z "$PID" ]] && ${name} $VBOX_SERVICE_OPTION &>/dev/null \
- && { add_daemon ${0##*/}; stat_done; } \
- || { stat_fail; exit 1; }
- ;;
- stop)
- stat_busy 'Stopping VirtualBox Guest Service'
- [[ -n "$PID" ]] && kill $PID &>/dev/null \
- && { rm_daemon ${0##*/}; stat_done; } \
- || { stat_fail; exit 1; }
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- status)
- stat_busy 'Checking VirtualBox Guest Service status'
- ck_status ${0##*/}
- ;;
- *)
- echo "usage: ${0##*/} {start|stop|restart|status}" >&2
- exit 1
-esac
-
-exit 0
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre/vboxweb.conf b/libre/virtualbox-libre/vboxweb.conf
deleted file mode 100644
index c36f6a143..000000000
--- a/libre/virtualbox-libre/vboxweb.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# WebService Mandatory Variables
-#VBOXWEB_USER=
-
-# WebService Variables
-#VBOXWEB_LOGFILE=
-#VBOXWEB_HOST=
-#VBOXWEB_PORT=
-#VBOXWEB_TIMEOUT=
-#VBOXWEB_CHECK_INTERVAL=
-#VBOXWEB_THREADS=
-#VBOXWEB_KEEPALIVE=
diff --git a/libre/virtualbox-libre/vboxweb.rc b/libre/virtualbox-libre/vboxweb.rc
deleted file mode 100644
index 97273e3c7..000000000
--- a/libre/virtualbox-libre/vboxweb.rc
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/vbox/vbox.cfg
-. /etc/conf.d/vboxweb
-
-BINARY="$INSTALL_DIR/vboxwebsrv"
-
-start() {
- stat_busy "Starting VirtualBox Web Service";
- if ! pidof -o %PPID $BINARY >/dev/null; then
- [[ "$VBOXWEB_USER" ]] || stat_die
- lsmod | grep -q "vboxdrv[^_-]" || stat_die
- PARAMS="--background"
- [[ "$VBOXWEB_HOST" ]] && PARAMS+=" -H $VBOXWEB_HOST"
- [[ "$VBOXWEB_PORT" ]] && PARAMS+=" -p $VBOXWEB_PORT"
- [[ "$VBOXWEB_TIMEOUT" ]] && PARAMS+=" -t $VBOXWEB_TIMEOUT"
- [[ "$VBOXWEB_CHECK_INTERVAL" ]] && PARAMS+=" -i $VBOXWEB_CHECK_INTERVAL"
- [[ "$VBOXWEB_THREADS" ]] && PARAMS+=" -T $VBOXWEB_THREADS"
- [[ "$VBOXWEB_KEEPALIVE" ]] && PARAMS+=" -k $VBOXWEB_KEEPALIVE"
- [[ "$VBOXWEB_LOGFILE" ]] && PARAMS+=" -F $VBOXWEB_LOGFILE"
- # prevent inheriting this setting to VBoxSVC
- unset VBOX_RELEASE_LOG_DEST
- su - $VBOXWEB_USER -c "$BINARY $PARAMS" &>/dev/null
- # ugly: wait until the final process has forked
- sleep .2
- if pidof -o %PPID $BINARY >/dev/null; then
- add_daemon vboxweb
- stat_done
- else
- stat_die
- fi
- else
- stat_die
- fi
-}
-
-stop() {
- stat_busy "Stopping VirtualBox Web Service"
- PID=$(pidof -o %PPID $BINARY)
- [[ $PID ]] && kill $PID &>/dev/null
- if ! pidof -o %PPID $BINARY >/dev/null; then
- rm_daemon vboxweb
- stat_done
- else
- stat_die
- fi
-}
-
-restart() {
- stop && start
-}
-
-status() {
- stat_busy "Checking for VirtualBox Web Service"
- if pidof -o %PPID $BINARY >/dev/null; then
- stat_done
- else
- stat_fail
- false
- fi
-}
-
-case "$1" in
-start)
- start
- ;;
-stop)
- stop
- ;;
-restart)
- restart
- ;;
-force-reload)
- restart
- ;;
-status)
- status
- ;;
-*)
- echo "Usage: $0 {start|stop|restart|status}"
- exit 1
-esac
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install b/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install
index 2d62eae43..067c5b35e 100644
--- a/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install
+++ b/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install
@@ -4,8 +4,8 @@
post_install() {
dkms add vboxguest/${1%-*}
cat << EOF
-==> To build and install your modules run dkms install vboxguest/${1%-*}
-==> To do this automatically at startup you can add dkms in your DAEMONS
+==> To build and install your modules run: dkms install vboxguest/${1%-*}
+==> To do this automatically at startup run: systemctl enable dkms.service
EOF
}
diff --git a/libre/virtualbox-libre/virtualbox-libre-host-dkms.install b/libre/virtualbox-libre/virtualbox-libre-host-dkms.install
index 8028cb7e0..8bc316e49 100644
--- a/libre/virtualbox-libre/virtualbox-libre-host-dkms.install
+++ b/libre/virtualbox-libre/virtualbox-libre-host-dkms.install
@@ -4,8 +4,8 @@
post_install() {
dkms add vboxhost/${1%-*}
cat << EOF
-==> To build and install your modules run dkms install vboxhost/${1%-*}
-==> To do this automatically at startup you can add dkms in your DAEMONS
+==> To build and install your modules run: dkms install vboxhost/${1%-*}
+==> To do this automatically at startup run: systemctl enable dkms.service
EOF
}
diff --git a/libre/virtualbox-libre/virtualbox-libre.install b/libre/virtualbox-libre/virtualbox-libre.install
index 90d8a8739..ad4f70f76 100644
--- a/libre/virtualbox-libre/virtualbox-libre.install
+++ b/libre/virtualbox-libre/virtualbox-libre.install
@@ -28,12 +28,6 @@ post_install() {
# arg 2: the old package version
post_upgrade() {
post_install "$1"
- if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then
- cat << EOF
-===> Starting with virtualbox-libre version 4.1.6-1, kernel modules handling is done by virtualbox-libre-host-modules.
-===> Use virtualbox-libre-host-dkms package if you don't use our stock linux-libre package.
-EOF
- fi
}
# arg 1: the old package version
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-07-03 05:15:24 +0000