summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-02-07 17:30:00 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2012-02-07 17:30:00 -0300
commit65a198135f3255fff0ee1a0d3f52b756347a4fca (patch)
treee5010dda00c3f773f68b0c6df979119e9fc09a33
parentbbbe8b0f93216d3d14afe0d843929db5f89ccb2d (diff)
parentb0b6cee54d701214ffadc018f75ef7c82ab9a14d (diff)
Merge branch 'master' of ssh://gparabola/abslibre
-rw-r--r--libre/texlive-bin-libre/PKGBUILD148
-rw-r--r--libre/texlive-bin-libre/texlive.install19
-rw-r--r--libre/virtualbox-libre/18-system-xorg.patch278
-rw-r--r--libre/virtualbox-libre/60-vboxguest.rules3
-rw-r--r--libre/virtualbox-libre/PKGBUILD55
-rw-r--r--libre/virtualbox-libre/vbox-service.rc4
-rw-r--r--libre/virtualbox-libre/vboxbuild18
-rw-r--r--libre/virtualbox-libre/vboxdrv-reference.patch56
-rw-r--r--libre/virtualbox-libre/virtualbox-4-makeself-check.patch11
-rw-r--r--libre/virtualbox-libre/virtualbox-4-mkisofs-check.patch11
-rw-r--r--libre/virtualbox-libre/virtualbox-parabola-modules.install25
-rw-r--r--libre/virtualbox-libre/virtualbox-source.install1
-rw-r--r--libre/virtualbox-libre/virtualbox.install6
-rw-r--r--libre/virtualbox-modules/60-vboxguest.rules (renamed from libre/virtualbox-parabola-modules/60-vboxguest.rules)0
-rw-r--r--libre/virtualbox-modules/LocalConfig.kmk (renamed from libre/virtualbox-parabola-modules/LocalConfig.kmk)0
-rw-r--r--libre/virtualbox-modules/PKGBUILD (renamed from libre/virtualbox-parabola-modules/PKGBUILD)25
-rw-r--r--libre/virtualbox-modules/virtualbox-modules.install (renamed from libre/virtualbox-parabola-modules/virtualbox-modules.install)6
-rw-r--r--libre/virtualbox-modules/virtualbox-parabola-modules.install (renamed from libre/virtualbox-parabola-modules/virtualbox-parabola-modules.install)6
18 files changed, 183 insertions, 489 deletions
diff --git a/libre/texlive-bin-libre/PKGBUILD b/libre/texlive-bin-libre/PKGBUILD
index 0074fb878..4964b0263 100644
--- a/libre/texlive-bin-libre/PKGBUILD
+++ b/libre/texlive-bin-libre/PKGBUILD
@@ -1,16 +1,17 @@
# Parabola maintainer: Michał Masłowski <mtjm@mtjm.eu>
+# $Id: PKGBUILD 148521 2012-02-03 01:16:06Z remy $
# Maintainer: Rémy Oudompheng <remy@archlinux.org>
# Contributor: francois <francois.archlinux.org>
pkgname=texlive-bin-libre
pkgver=2011.3
_luatex_ver=0.70.1
-pkgrel=1
+pkgrel=4
pkgdesc="TeX Live binaries"
license=('GPL')
arch=('i686' 'x86_64' 'mips64el')
depends=('t1lib' 'gd' 'poppler>=0.18.2' 'libsigsegv' 'zziplib')
-makedepends=('perl' 'clisp' 'ffcall' 'pkg-config')
+makedepends=('perl' 'clisp' 'ffcall')
optdepends=('ed: for texconfig')
provides=('lcdf-typetools' 'kpathsea' 'xindy' 'pdfjam' 'texlive-bin')
conflicts=('pdfjam' 'texlive-bin')
@@ -48,10 +49,7 @@ md5sums=('220a4f4cc0d915bf8fcbcb553dcee1ae'
'e7f0197559ef865d8c01683dab3b8526')
build() {
- cd $srcdir
- # Remove bundled packages available in Parabola or not needed.
- rm -rf source/{extra/{djgpp,xz},libs/{freetype2,gd,xpdf,libpng,zziplib,zlib,t1lib,poppler},utils/dialog}
- rm -rf luatex/source/libs/{libpng,zziplib,zlib,poppler}
+ cd "$srcdir"
# Building LuaTeX
# cd luatex-beta-${_luatex_ver}
cd luatex
@@ -72,7 +70,6 @@ build() {
--without-system-icu \
--without-system-kpathsea \
--with-system-freetype2 \
- --with-system-xpdf \
--with-system-poppler \
--with-freetype2-libdir=/usr/lib \
--with-freetype2-include=/usr/include/freetype2 \
@@ -105,7 +102,9 @@ build() {
test ! -d Work && mkdir Work
cd Work
echo "--> Initial configuration..."
- # we use temporary prefix to avoid messing the existing $pkgdir/usr/share/texmf tree
+ # we use temporary prefix to avoid messing the existing
+ # $pkgdir/usr/share/texmf tree
+ # system zlib is disabled due to issues with zlib 1.2.6 (FS#28221)
../configure --prefix=/usr -C \
--sysconfdir=/etc \
--datarootdir=/usr/share \
@@ -119,17 +118,16 @@ build() {
--disable-t1utils \
--disable-bibtexu \
--disable-xz \
- --with-system-zlib \
- --with-system-zziplib \
- --with-system-pnglib \
+ --without-system-zlib \
+ --without-system-zziplib \
+ --without-system-pnglib \
--with-system-ncurses \
--with-system-t1lib \
- --with-system-gd \
- --with-system-poppler \
- --with-system-xpdf \
- --with-system-freetype2 \
+ --without-system-gd \
+ --without-system-poppler \
+ --without-system-xpdf \
+ --without-system-freetype2 \
--without-system-graphite \
- --with-system-icu \
--with-freetype2-libdir=/usr/lib \
--with-freetype2-include=/usr/include/freetype2 \
--with-xdvi-x-toolkit=xaw \
@@ -137,8 +135,6 @@ build() {
--disable-aleph \
--disable-luatex \
--with-clisp-runtime=default \
- --disable-static \
- --enable-shared \
--enable-xindy --disable-xindy-rules --disable-xindy-docs
#############################################################
### make
@@ -149,65 +145,65 @@ build() {
}
package() {
- cd $srcdir
+ cd "$srcdir"
#############################################################
### install texmf tree
echo "-------------------------------------------------------"
echo "--> installing the texmf tree"
echo "-------------------------------------------------------"
- install -m755 -d $pkgdir/usr/share
- cp -r texmf $pkgdir/usr/share/
- install -d -m755 $pkgdir/etc/texmf/web2c
- install -d -m755 $pkgdir/etc/texmf/chktex
- install -d -m755 $pkgdir/etc/texmf/dvips/config
- install -d -m755 $pkgdir/etc/texmf/dvipdfm/config
- install -d -m755 $pkgdir/etc/texmf/dvipdfmx
- install -d -m755 $pkgdir/etc/texmf/tex/generic/config
- install -d -m755 $pkgdir/etc/texmf/ttf2pk
- install -d -m755 $pkgdir/etc/texmf/xdvi
- install -d -m755 $pkgdir/etc/fonts/conf.avail
- install -m644 $srcdir/09-texlive-fonts.conf $pkgdir/etc/fonts/conf.avail/
+ install -m755 -d "$pkgdir"/usr/share
+ cp -r texmf "$pkgdir"/usr/share/
+ install -d -m755 "$pkgdir"/etc/texmf/web2c
+ install -d -m755 "$pkgdir"/etc/texmf/chktex
+ install -d -m755 "$pkgdir"/etc/texmf/dvips/config
+ install -d -m755 "$pkgdir"/etc/texmf/dvipdfm/config
+ install -d -m755 "$pkgdir"/etc/texmf/dvipdfmx
+ install -d -m755 "$pkgdir"/etc/texmf/tex/generic/config
+ install -d -m755 "$pkgdir"/etc/texmf/ttf2pk
+ install -d -m755 "$pkgdir"/etc/texmf/xdvi
+ install -d -m755 "$pkgdir"/etc/fonts/conf.avail
+ install -m644 "$srcdir"/09-texlive-fonts.conf "$pkgdir"/etc/fonts/conf.avail/
# move man files to /usr/share/man
for i in 1 5; do
- install -d -m755 $pkgdir/usr/share/man/man$i
- mv $pkgdir/usr/share/texmf/doc/man/man$i/*.$i $pkgdir/usr/share/man/man$i/
+ install -d -m755 "$pkgdir"/usr/share/man/man$i
+ mv "$pkgdir"/usr/share/texmf/doc/man/man$i/*.$i "$pkgdir"/usr/share/man/man$i/
done
# move info files to /usr/share/info
- install -d -m755 $pkgdir/usr/share/info
- mv $pkgdir/usr/share/texmf/doc/info/*.info $pkgdir/usr/share/info/
- rm -rf $pkgdir/usr/share/texmf/doc/{man,info}
+ install -d -m755 "$pkgdir"/usr/share/info
+ mv "$pkgdir"/usr/share/texmf/doc/info/*.info "$pkgdir"/usr/share/info/
+ rm -rf "$pkgdir"/usr/share/texmf/doc/{man,info}
# copy config files to $TEXMFCONFIG tree
- cp -a $pkgdir/usr/share/texmf/chktex/chktexrc \
- $pkgdir/etc/texmf/chktex/
- cp -a $pkgdir/usr/share/texmf/web2c/mktex.cnf \
- $pkgdir/etc/texmf/web2c/
- cp -a $pkgdir/usr/share/texmf/web2c/updmap.cfg \
- $pkgdir/etc/texmf/web2c/
- cp -a $pkgdir/usr/share/texmf/web2c/fmtutil.cnf \
- $pkgdir/etc/texmf/web2c/
- cp -a $pkgdir/usr/share/texmf/dvips/config/config.ps \
- $pkgdir/etc/texmf/dvips/config/
- cp -a $pkgdir/usr/share/texmf/dvipdfm/config/config \
- $pkgdir/etc/texmf/dvipdfm/config/
- cp -a $pkgdir/usr/share/texmf/dvipdfmx/dvipdfmx.cfg \
- $pkgdir/etc/texmf/dvipdfmx/
- cp -a $pkgdir/usr/share/texmf/tex/generic/config/pdftexconfig.tex \
- $pkgdir/etc/texmf/tex/generic/config/
- cp -a $pkgdir/usr/share/texmf/tex/generic/config/language.dat \
- $pkgdir/etc/texmf/tex/generic/config/
- cp -a $pkgdir/usr/share/texmf/tex/generic/config/language.def \
- $pkgdir/etc/texmf/tex/generic/config/
- cp -a $pkgdir/usr/share/texmf/ttf2pk/ttf2pk.cfg \
- $pkgdir/etc/texmf/ttf2pk/
- cp -a $pkgdir/usr/share/texmf/xdvi/XDvi \
- $pkgdir/etc/texmf/xdvi/
+ cp -a "$pkgdir"/usr/share/texmf/chktex/chktexrc \
+ "$pkgdir"/etc/texmf/chktex/
+ cp -a "$pkgdir"/usr/share/texmf/web2c/mktex.cnf \
+ "$pkgdir"/etc/texmf/web2c/
+ cp -a "$pkgdir"/usr/share/texmf/web2c/updmap.cfg \
+ "$pkgdir"/etc/texmf/web2c/
+ cp -a "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf \
+ "$pkgdir"/etc/texmf/web2c/
+ cp -a "$pkgdir"/usr/share/texmf/dvips/config/config.ps \
+ "$pkgdir"/etc/texmf/dvips/config/
+ cp -a "$pkgdir"/usr/share/texmf/dvipdfm/config/config \
+ "$pkgdir"/etc/texmf/dvipdfm/config/
+ cp -a "$pkgdir"/usr/share/texmf/dvipdfmx/dvipdfmx.cfg \
+ "$pkgdir"/etc/texmf/dvipdfmx/
+ cp -a "$pkgdir"/usr/share/texmf/tex/generic/config/pdftexconfig.tex \
+ "$pkgdir"/etc/texmf/tex/generic/config/
+ cp -a "$pkgdir"/usr/share/texmf/tex/generic/config/language.dat \
+ "$pkgdir"/etc/texmf/tex/generic/config/
+ cp -a "$pkgdir"/usr/share/texmf/tex/generic/config/language.def \
+ "$pkgdir"/etc/texmf/tex/generic/config/
+ cp -a "$pkgdir"/usr/share/texmf/ttf2pk/ttf2pk.cfg \
+ "$pkgdir"/etc/texmf/ttf2pk/
+ cp -a "$pkgdir"/usr/share/texmf/xdvi/XDvi \
+ "$pkgdir"/etc/texmf/xdvi/
# remove TL specific warnings in the language.{dat,def} files:
- sed -i -e '/DO NOT EDIT/,+3 d' $pkgdir/etc/texmf/tex/generic/config/language.*
+ sed -i -e '/DO NOT EDIT/,+3 d' "$pkgdir"/etc/texmf/tex/generic/config/language.*
# clean updmap.cfg
- sed -i '/^\(Map\|MixedMap\)/d' $pkgdir/etc/texmf/web2c/updmap.cfg
- sed -i '/^#! \(Map\|MixedMap\)/d' $pkgdir/etc/texmf/web2c/updmap.cfg
+ sed -i '/^\(Map\|MixedMap\)/d' "$pkgdir"/etc/texmf/web2c/updmap.cfg
+ sed -i '/^#! \(Map\|MixedMap\)/d' "$pkgdir"/etc/texmf/web2c/updmap.cfg
# Don't list formats which need removed packages to work.
- sed -i '/csplain\|mex\|jadetex/d' $pkgdir/etc/texmf/web2c/fmtutil.cnf
+ sed -i '/csplain\|mex\|jadetex/d' "$pkgdir"/etc/texmf/web2c/fmtutil.cnf
#############################################################
### install
@@ -219,24 +215,24 @@ package() {
echo "--> Proceeding with make install ..."
echo "-------------------------------------------------------"
cd Work
- make DESTDIR=${pkgdir} texmf=$pkgdir/usr/share/texmf install
- rm -rf ${pkgdir}/usr/{texmf,share/texmf-dist}
+ make DESTDIR=${pkgdir} texmf="$pkgdir"/usr/share/texmf install
+ rm -rf "${pkgdir}"/usr/{texmf,share/texmf-dist}
# replace upstream texmf.cnf with ours
- rm -f $pkgdir/usr/share/texmf/web2c/texmf.cnf
- install -m644 $srcdir/texmf.cnf $pkgdir/etc/texmf/web2c/texmf.cnf
+ rm -f "$pkgdir"/usr/share/texmf/web2c/texmf.cnf
+ install -m644 "$srcdir"/texmf.cnf $pkgdir/etc/texmf/web2c/texmf.cnf
# since the location of texmf.cnf is hard-wired to be under /usr/share/texmf/web2c
# we make a symlink from /etc/texmf/web2c/texmf.cnf to the latter
- ln -sf /etc/texmf/web2c/texmf.cnf $pkgdir/usr/share/texmf/web2c/texmf.cnf
+ ln -sf /etc/texmf/web2c/texmf.cnf "$pkgdir"/usr/share/texmf/web2c/texmf.cnf
# fix location of TEXMFCACHE for luatools
- sed -i 's#texlive2010#texlive#' $pkgdir/usr/share/texmf/web2c/texmfcnf.lua
+ sed -i 's#texlive2010#texlive#' "$pkgdir"/usr/share/texmf/web2c/texmfcnf.lua
## remove aleph from fmtutil.cnf
- sed -i -e '/aleph/d' $pkgdir/usr/share/texmf/web2c/fmtutil.cnf
+ sed -i -e '/aleph/d' "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf
## install luatex binary
- cd $srcdir/luatex/build/texk/web2c
- ./libtool --mode=install install -m755 luatex $pkgdir/usr/bin/
- cd $pkgdir/usr/bin
+ cd "$srcdir"/luatex/build/texk/web2c
+ ./libtool --mode=install install -m755 luatex "$pkgdir"/usr/bin/
+ cd "$pkgdir"/usr/bin
/bin/ln -s luatex texlua
/bin/ln -s luatex texluac
@@ -246,7 +242,7 @@ package() {
# create symlinks for formats
echo "--> Create symlinks for TeX formats ..."
- LD_PRELOAD="${pkgdir}/usr/lib/libkpathsea.so.6" PATH="$PATH:${pkgdir}/usr/bin" texlinks -f $pkgdir/usr/share/texmf/web2c/fmtutil.cnf $pkgdir/usr/bin/
+ PATH="$PATH:${pkgdir}/usr/bin" texlinks -f "$pkgdir"/usr/share/texmf/web2c/fmtutil.cnf "$pkgdir"/usr/bin/
#############################################################
# remove dangling symlinks
_bibtexextra_scripts="
@@ -343,7 +339,7 @@ vpe"
${_pstricks_scripts} \
${_science_scripts} \
tlmgr; do
- rm -f $pkgdir/usr/bin/$s
+ rm -f "$pkgdir"/usr/bin/$s
done
###################################################################
}
diff --git a/libre/texlive-bin-libre/texlive.install b/libre/texlive-bin-libre/texlive.install
index 9307c536b..b85850123 100644
--- a/libre/texlive-bin-libre/texlive.install
+++ b/libre/texlive-bin-libre/texlive.install
@@ -1,3 +1,6 @@
+infodir=usr/share/info
+filelist=(dvipng.info dvips.info eplain.info epspdf.info fontname.info kpathsea.info latex2e-es.info latex2e.info latex2man.info mf2pt1.info tds.info texdraw.info web2c.info)
+
post_install() {
echo ">>> texlive: updating the filename database..."
usr/bin/mktexlsr
@@ -5,6 +8,11 @@ post_install() {
usr/bin/fmtutil-sys --all 1>/dev/null
echo " done."
echo " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
+
+ [[ -x usr/bin/install-info ]] || return 0
+ for file in "${filelist[@]}"; do
+ install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+ done
}
post_upgrade() {
@@ -14,5 +22,16 @@ post_upgrade() {
usr/bin/fmtutil-sys --all 1>/dev/null
echo " done."
echo " (logs are under /var/lib/texmf/web2c/<engine>/<formatname>.log)"
+
+ [[ -x usr/bin/install-info ]] || return 0
+ for file in "${filelist[@]}"; do
+ install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+ done
}
+pre_remove() {
+ [[ -x usr/bin/install-info ]] || return 0
+ for file in "${filelist[@]}"; do
+ install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+ done
+}
diff --git a/libre/virtualbox-libre/18-system-xorg.patch b/libre/virtualbox-libre/18-system-xorg.patch
deleted file mode 100644
index baca4bc5b..000000000
--- a/libre/virtualbox-libre/18-system-xorg.patch
+++ /dev/null
@@ -1,278 +0,0 @@
-Description: Build the X.Org driver only for the selected system X Server version.
-Author: Michael Meskes <meskes@debian.org>, Felix Geyer <debfx-pkg@fobos.de>
-
-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/libre/virtualbox-libre/60-vboxguest.rules b/libre/virtualbox-libre/60-vboxguest.rules
deleted file mode 100644
index d64575709..000000000
--- a/libre/virtualbox-libre/60-vboxguest.rules
+++ /dev/null
@@ -1,3 +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/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
index 45b870e64..edf35ff62 100644
--- a/libre/virtualbox-libre/PKGBUILD
+++ b/libre/virtualbox-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 56698 2011-10-10 18:23:45Z ibiru $
+# $Id: PKGBUILD 63763 2012-02-05 12:13:00Z ibiru $
# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
# Changes:
# * Adapt to linux-libre
@@ -9,20 +9,28 @@
#Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgbase=virtualbox-libre
pkgname=('virtualbox-libre' 'virtualbox-parabola-additions' 'virtualbox-sdk' 'virtualbox-source')
-pkgver=4.1.4
-pkgrel=3
+pkgver=4.1.8
+pkgrel=2
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' 'linux-libre-headers' 'mesa' 'libxrandr' 'libxinerama' 'libvncserver' 'openjdk6' '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
- virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch
10-vboxdrv.rules vboxdrv-reference.patch LocalConfig.kmk vboxbuild
change_default_driver_dir.patch vbox-service.conf vbox-service.rc)
+md5sums=('2092bba46baa62fab5520d67dee2ece8'
+ '5f85710e0b8606de967716ded7b2d351'
+ '6ab2455c391d8cc005e2f4461ae26a3b'
+ '78ffa67ff131680f1d2b6f06d4325c5b'
+ '67688bff176d3c6fac5664dc282fea52'
+ '97e193f050574dd272a38e5ee5ebe62b'
+ '3c08ad30b89add47d3f45121200a5360'
+ 'e7416331d0bc331f3b5aae3e5d104642')
-_extramodules=extramodules-3.1-LIBRE
+_extramodules=extramodules-3.2-LIBRE
_kernver="$(cat /lib/modules/${_extramodules}/version)"
build() {
@@ -46,17 +54,16 @@ build() {
package_virtualbox-libre() {
pkgdesc="Powerful x86 virtualization for enterprise as well as home use"
- depends=('virtualbox-modules' 'libxml2' 'libxcursor' 'libidl2' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng')
+ depends=('virtualbox-modules' 'libxml2' 'libxcursor' 'libxinerama' 'sdl' 'libxmu' 'curl' 'libvncserver' 'libpng')
optdepends=('qt: for VirtualBox GUI'
'vde2: Virtual Distributed Ethernet support'
'virtualbox-sdk: developer kit'
'virtualbox-source: host kernel source modules for non-stock kernels')
- replaces=('virtualbox')
- conflicts=('virtualbox')
- provides=("virtualbox=$pkgver")
- replaces=('virtualbox-ose')
- conflicts=('virtualbox-ose')
+ backup=('etc/vbox/vbox.cfg')
+ replaces=('virtualbox' 'virtualbox-ose')
+ conflicts=('virtualbox' 'virtualbox-ose')
+ provides=("virtualbox=$pkgver")
install=virtualbox.install
source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
@@ -117,7 +124,9 @@ package_virtualbox-libre() {
package_virtualbox-source() {
pkgdesc="VirtualBox kernel modules source"
- depends=(linux-libre-headers gcc make)
+ depends=(gcc make)
+ provides=(virtualbox-modules)
+ optdepends=('linux-libre-headers')
install=virtualbox-source.install
source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
@@ -151,7 +160,7 @@ package_virtualbox-sdk() {
package_virtualbox-parabola-additions(){
pkgdesc="Additions only for Parabola guests (userspace tools)"
- depends=("virtualbox-parabola-modules=$pkgver" 'gcc-libs' 'libxmu' 'xorg-xrandr')
+ depends=("virtualbox-parabola-modules=$pkgver" 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes')
replaces=('virtualbox-guest-additions' 'virtualbox-archlinux-additions')
conflicts=('virtualbox-guest-additions' 'virtualbox-archlinux-additions')
provides=("virtualbox-archlinux-additions=${pkgver}")
@@ -181,23 +190,3 @@ package_virtualbox-parabola-additions(){
# install sample config
install -D -m644 "${srcdir}/vbox-service.conf" "${pkgdir}/etc/conf.d/vbox-service"
}
-md5sums=('dc6e6801b3823332b6ca2e9915221aae'
- 'bc048d1e58d84ece4a186199ee48d4c8'
- '5f85710e0b8606de967716ded7b2d351'
- 'cc3f278bc273011aa95277500a76f677'
- '78ffa67ff131680f1d2b6f06d4325c5b'
- 'a82d698e7868315cdf876cfb02fd2268'
- '97e193f050574dd272a38e5ee5ebe62b'
- '3c08ad30b89add47d3f45121200a5360'
- '778d865e56e31cc592fbfa257fdcfce7')
-
-md5sums=('dc6e6801b3823332b6ca2e9915221aae'
- 'a9f22ccaacb207e0e1c5450fede82d06'
- 'b7cbcf89a30c712fed4435dea28d1703'
- '5f85710e0b8606de967716ded7b2d351'
- 'cc3f278bc273011aa95277500a76f677'
- '78ffa67ff131680f1d2b6f06d4325c5b'
- 'a82d698e7868315cdf876cfb02fd2268'
- '97e193f050574dd272a38e5ee5ebe62b'
- '3c08ad30b89add47d3f45121200a5360'
- '778d865e56e31cc592fbfa257fdcfce7')
diff --git a/libre/virtualbox-libre/vbox-service.rc b/libre/virtualbox-libre/vbox-service.rc
index c1af2134d..6f1b8d892 100644
--- a/libre/virtualbox-libre/vbox-service.rc
+++ b/libre/virtualbox-libre/vbox-service.rc
@@ -11,13 +11,13 @@ case "$1" in
start)
stat_busy "Starting $name service"
[[ -z "$PID" ]] && ${name} $VBOX_SERVICE_OPTION &>/dev/null \
- && { add_daemon $name; stat_done; } \
+ && { add_daemon vbox-service; stat_done; } \
|| { stat_fail; exit 1; }
;;
stop)
stat_busy "Stopping $name service"
[[ -n "$PID" ]] && kill $PID &>/dev/null \
- && { rm_daemon $name; stat_done; } \
+ && { rm_daemon vbox-service; stat_done; } \
|| { stat_fail; exit 1; }
;;
restart)
diff --git a/libre/virtualbox-libre/vboxbuild b/libre/virtualbox-libre/vboxbuild
index cfc3c0a66..e6fb94edd 100644
--- a/libre/virtualbox-libre/vboxbuild
+++ b/libre/virtualbox-libre/vboxbuild
@@ -32,11 +32,11 @@ fi
for kdir in /lib/modules/[2-3]*; do
if [[ ! -d $kdir/kernel ]]; then
# found a stale kernel
- mods=("$kdir/misc/vbox"{drv,netadp,netflt,pci}.ko*)
+ mods=("$kdir/extramodules"{drv,netadp,netflt,pci}.ko*)
if (( ${#mods[@]} )); then
stat_busy "Removing all old VirtualBox kernel modules"
if rm -f "${mods[@]}" &&
- rmdir -p --ignore-fail-on-non-empty "$p/misc/" 2>/dev/null; then
+ rmdir -p --ignore-fail-on-non-empty "$kdir/extramodules" 2>/dev/null; then
stat_done
else
stat_fail
@@ -52,6 +52,7 @@ fi
for kernver; do
export KERN_DIR=/lib/modules/$kernver/build
+ export MODULE_DIR=/lib/modules/$kernver/extramodules
if [[ ! -d $KERN_DIR ]]; then
printf "error: \`%s' does not appear to be a valid kernel build directory.\n" \
"$KERN_DIR"
@@ -59,15 +60,22 @@ for kernver; do
fi
stat_busy "Recompiling VirtualBox kernel modules ($kernver)"
- for build in BUILDVBOX{DRV,NETFLT,NETADP,PCI}; do
+ 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"
+ stat_fail
+ fi
+ for build in BUILDVBOX{NETFLT,NETADP,PCI}; do
if ! ${!build} \
- --save-module-symvers /tmp/vboxdrv-Module.symvers \
+ --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"
stat_fail
- continue
fi
done
+ gzip -f9 "$MODULE_DIR"/*.ko
+ depmod "$kernver"
stat_done
done
diff --git a/libre/virtualbox-libre/vboxdrv-reference.patch b/libre/virtualbox-libre/vboxdrv-reference.patch
index c310dbc8d..710e2e511 100644
--- a/libre/virtualbox-libre/vboxdrv-reference.patch
+++ b/libre/virtualbox-libre/vboxdrv-reference.patch
@@ -1,45 +1,57 @@
-diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
---- VirtualBox-4.1.0_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-07-19 15:11:37.730121727 +0000
-+++ VirtualBox-4.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-07-19 19:02:15.658471139 +0000
-@@ -75,9 +75,8 @@
+diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
+--- VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:22:13.636083176 +0000
++++ VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2011-11-04 17:48:58.915541368 +0000
+@@ -75,10 +75,9 @@
"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<br/><br/>"
- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
-- "as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS "
-- "package first. This package keeps track of Linux kernel changes and "
-+ " <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>"
-+ "as root. This package keeps track of Linux kernel changes and"
- "recompiles the vboxdrv kernel module if necessary."
+- "as root. If it is available in your distribution, you should install the "
+- "DKMS package first. This package keeps track of Linux kernel changes and "
+- "recompiles the vboxdrv kernel module if necessary."
++ " <font color=blue>'pacman -S virtualbox-modules'</font><br/><br/>"
++ "as root. If you don't use our stock kernel, install virtualbox-source and"
++ "execute /usr/bin/vboxbuild ."
);
-@@ -92,7 +91,7 @@
+ QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
+@@ -90,11 +89,8 @@
+
+ QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr(
"The VirtualBox kernel modules do not match this version of "
- "VirtualBox. The installation of VirtualBox was apparently not "
- "successful. Executing<br/><br/>"
+- "VirtualBox. The installation of VirtualBox was apparently not "
+- "successful. Executing<br/><br/>"
- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
+- "may correct this. Make sure that you do not mix the "
+- "OSE version and the PUEL version of VirtualBox."
++ "VirtualBox. Reload the modules or if you don't use our stock kernel execute<br/><br/> "
+ " <font color=blue>'/usr/bin/vboxbuild'</font><br/><br/>"
- "may correct this. Make sure that you do not mix the "
- "OSE version and the PUEL version of VirtualBox."
);
-diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.0_OSE/src/VBox/Installer/linux/VBox.sh
---- VirtualBox-4.1.0_OSE.orig/src/VBox/Installer/linux/VBox.sh 2011-07-19 15:11:37.603453927 +0000
-+++ VirtualBox-4.1.0_OSE/src/VBox/Installer/linux/VBox.sh 2011-07-19 19:02:15.658471139 +0000
-@@ -34,7 +34,7 @@
+
+ QString g_QStrHintOtherNoDriver = QApplication::tr(
+diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh
+--- VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:22:13.549415814 +0000
++++ VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh 2011-11-04 17:56:50.735874087 +0000
+@@ -32,17 +32,18 @@
+ cat << EOF
+ WARNING: The vboxdrv kernel module is not loaded. Either there is no module
available for the current kernel (`uname -r`) or it failed to
- load. Please recompile the kernel module and install it by
+- load. Please recompile the kernel module and install it by
++ load. Please reinstall the kernel module virtualbox-modules or
++ if you don't use our stock kernel compile the modules with
- sudo /etc/init.d/vboxdrv setup
+ sudo /usr/bin/vboxbuild
You will not be able to start VMs until this problem is fixed.
EOF
-@@ -42,7 +42,7 @@
+ elif [ ! -c /dev/vboxdrv ]; then
cat << EOF
- WARNING: The character device /dev/vboxdrv does not exist. Try
+-WARNING: The character device /dev/vboxdrv does not exist. Try
++WARNING: The character device /dev/vboxdrv does not exist. Try to load the module
- sudo /etc/init.d/vboxdrv restart
-+ sudo /usr/bin/vboxbuild
++ sudo modprobe vboxdrv
and if that is not successful, try to re-install the package.
diff --git a/libre/virtualbox-libre/virtualbox-4-makeself-check.patch b/libre/virtualbox-libre/virtualbox-4-makeself-check.patch
deleted file mode 100644
index 57862b41e..000000000
--- a/libre/virtualbox-libre/virtualbox-4-makeself-check.patch
+++ /dev/null
@@ -1,11 +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/libre/virtualbox-libre/virtualbox-4-mkisofs-check.patch b/libre/virtualbox-libre/virtualbox-4-mkisofs-check.patch
deleted file mode 100644
index d43962148..000000000
--- a/libre/virtualbox-libre/virtualbox-4-mkisofs-check.patch
+++ /dev/null
@@ -1,11 +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/libre/virtualbox-libre/virtualbox-parabola-modules.install b/libre/virtualbox-libre/virtualbox-parabola-modules.install
deleted file mode 100644
index 75d28784a..000000000
--- a/libre/virtualbox-libre/virtualbox-parabola-modules.install
+++ /dev/null
@@ -1,25 +0,0 @@
-KERNEL_VERSION='3.0-LIBRE'
-
-post_install() {
- cat << EOM
-
-===> virtualbox-parabola-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/libre/virtualbox-libre/virtualbox-source.install b/libre/virtualbox-libre/virtualbox-source.install
index 14537f23d..24d90b1c2 100644
--- a/libre/virtualbox-libre/virtualbox-source.install
+++ b/libre/virtualbox-libre/virtualbox-source.install
@@ -10,4 +10,3 @@ post_upgrade() {
===> To recompile the modules do /usr/bin/vboxbuild
EOF
}
-
diff --git a/libre/virtualbox-libre/virtualbox.install b/libre/virtualbox-libre/virtualbox.install
index b2d2e8858..29646e973 100644
--- a/libre/virtualbox-libre/virtualbox.install
+++ b/libre/virtualbox-libre/virtualbox.install
@@ -20,10 +20,10 @@ post_install() {
post_upgrade() {
getent group vboxusers >> /dev/null || usr/sbin/groupadd -g 108 vboxusers
utils
- if [ "$(vercmp $2 4.1.4-3)" -lt 0 ]; then
+ if [ "$(vercmp $2 4.1.6-1)" -lt 0 ]; then
/bin/cat << EOF
-===> Starting with virtualbox version 4.1.4-3, kernel modules handling is done by virtualbox-modules.
-===> Use virtualbox-source package if you don't use our stock linux package.
+===> Starting with virtualbox version 4.1.6-1, kernel modules handling is done by virtualbox-modules.
+===> Use virtualbox-source package if you don't use our stock linux-libre package.
EOF
fi
}
diff --git a/libre/virtualbox-parabola-modules/60-vboxguest.rules b/libre/virtualbox-modules/60-vboxguest.rules
index 6285f7249..6285f7249 100644
--- a/libre/virtualbox-parabola-modules/60-vboxguest.rules
+++ b/libre/virtualbox-modules/60-vboxguest.rules
diff --git a/libre/virtualbox-parabola-modules/LocalConfig.kmk b/libre/virtualbox-modules/LocalConfig.kmk
index af79f90cd..af79f90cd 100644
--- a/libre/virtualbox-parabola-modules/LocalConfig.kmk
+++ b/libre/virtualbox-modules/LocalConfig.kmk
diff --git a/libre/virtualbox-parabola-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD
index d077c092a..9359edfb2 100644
--- a/libre/virtualbox-parabola-modules/PKGBUILD
+++ b/libre/virtualbox-modules/PKGBUILD
@@ -1,29 +1,28 @@
-# $Id: PKGBUILD 57345 2011-10-26 09:57:11Z ibiru $
+# $Id: PKGBUILD 62846 2012-01-27 17:21:04Z ibiru $
#Maintainer: Ionut Biru <ibiru@archlinux.org>
pkgbase=virtualbox-modules
pkgname=('virtualbox-modules' 'virtualbox-parabola-modules')
-pkgver=4.1.4
-pkgrel=3.1
+pkgver=4.1.8
+pkgrel=3
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL')
-makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-headers' 'linux-libre')
+makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-headers')
[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2
LocalConfig.kmk 60-vboxguest.rules)
-md5sums=('dc6e6801b3823332b6ca2e9915221aae'
+md5sums=('2092bba46baa62fab5520d67dee2ece8'
'4c88bd122677a35f68abd76eb01b378b'
'ed1341881437455d9735875ddf455fbe')
-_extramodules=extramodules-3.1-LIBRE
+_extramodules=extramodules-3.2-LIBRE
+_kernver="$(cat /lib/modules/${_extramodules}/version || true)"
-build() {
- _kernver="$(cat /lib/modules/${_extramodules}/version)"
-
- export KERN_DIR=/lib/modules/${_kernver}/build
- export KERN_INCL=/usr/src/linux-${_kernver}/include/
+export KERN_DIR=/lib/modules/${_kernver}/build
+export KERN_INCL=/usr/src/linux-${_kernver}/include/
+build() {
cd "$srcdir/VirtualBox-${pkgver}_OSE"
cp "$srcdir/LocalConfig.kmk" .
@@ -52,7 +51,7 @@ package_virtualbox-parabola-modules(){
pkgdesc="Additions only for Parabola guests (kernel modules)"
license=('GPL')
install=virtualbox-parabola-modules.install
- depends=('linux>=3.1' 'linux<3.2')
+ depends=('linux>=3.2' 'linux<3.3')
replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules')
conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules')
provides=("virtualbox-archlinux-modules=$pkgver")
@@ -78,7 +77,7 @@ package_virtualbox-modules(){
pkgdesc="Kernel modules for VirtualBox"
license=('GPL')
install=virtualbox-modules.install
- depends=('linux>=3.1' 'linux<3.2')
+ depends=('linux>=3.2' 'linux<3.3')
source "$srcdir/VirtualBox-${pkgver}_OSE/env.sh"
diff --git a/libre/virtualbox-parabola-modules/virtualbox-modules.install b/libre/virtualbox-modules/virtualbox-modules.install
index b57135999..671c129d6 100644
--- a/libre/virtualbox-parabola-modules/virtualbox-modules.install
+++ b/libre/virtualbox-modules/virtualbox-modules.install
@@ -3,17 +3,17 @@ post_install() {
===> You must load vboxdrv module before starting VirtualBox:
===> # modprobe vboxdrv
EOF
- EXTRAMODULES='extramodules-3.1-LIBRE'
+ EXTRAMODULES='extramodules-3.2-LIBRE'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}
post_upgrade() {
- EXTRAMODULES='extramodules-3.1-LIBRE'
+ EXTRAMODULES='extramodules-3.2-LIBRE'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
rmmod vboxdrv || echo 'In order to use the new version, reload all virtualbox modules manually.'
}
post_remove() {
- EXTRAMODULES='extramodules-3.1-LIBRE'
+ EXTRAMODULES='extramodules-3.2-LIBRE'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}
diff --git a/libre/virtualbox-parabola-modules/virtualbox-parabola-modules.install b/libre/virtualbox-modules/virtualbox-parabola-modules.install
index 8801d8c49..b542db1ca 100644
--- a/libre/virtualbox-parabola-modules/virtualbox-parabola-modules.install
+++ b/libre/virtualbox-modules/virtualbox-parabola-modules.install
@@ -2,16 +2,16 @@ post_install() {
cat << EOF
===> You may want to load vboxguest, vboxsf and vboxvideo
EOF
- EXTRAMODULES='extramodules-3.1-LIBRE'
+ EXTRAMODULES='extramodules-3.2-LIBRE'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}
post_upgrade() {
- EXTRAMODULES='extramodules-3.1-LIBRE'
+ EXTRAMODULES='extramodules-3.2-LIBRE'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}
post_remove() {
- EXTRAMODULES='extramodules-3.1-LIBRE'
+ EXTRAMODULES='extramodules-3.2-LIBRE'
depmod $(cat /lib/modules/$EXTRAMODULES/version)
}