[arch-commits] Commit in virtualbox/trunk (3 files)
Sébastien Luttringer
seblu at archlinux.org
Sun Dec 14 02:49:47 UTC 2014
Date: Sunday, December 14, 2014 @ 03:49:46
Author: seblu
Revision: 123864
upgpkg: virtualbox 4.3.20-2
- fix FS#43098
- fix FS#43035
Added:
virtualbox/trunk/virtualbox-guest-utils.sysusers
Modified:
virtualbox/trunk/PKGBUILD
virtualbox/trunk/virtualbox-guest-utils.install
---------------------------------+
PKGBUILD | 39 ++++++++++++++++++++++++++++++--------
virtualbox-guest-utils.install | 18 ++++-------------
virtualbox-guest-utils.sysusers | 1
3 files changed, 37 insertions(+), 21 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-12-14 01:30:18 UTC (rev 123863)
+++ PKGBUILD 2014-12-14 02:49:46 UTC (rev 123864)
@@ -10,7 +10,7 @@
'virtualbox-guest-utils'
'virtualbox-ext-vnc')
pkgver=4.3.20
-pkgrel=1
+pkgrel=2
arch=('i686' 'x86_64')
url='http://virtualbox.org'
license=('GPL' 'custom')
@@ -49,6 +49,7 @@
'xorg-server-devel')
[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.tar.bz2"
+ 'virtualbox-guest-utils.sysusers'
'60-vboxdrv.rules'
'60-vboxguest.rules'
'LocalConfig.kmk'
@@ -63,6 +64,7 @@
'006-rdesktop-vrdp-keymap-path.patch'
'007-python2-path.patch')
md5sums=('cf3f25644aa0fae1029e8b362bd4375e'
+ '4833c8e0524fd2272b24ba0d94aef006'
'6e2722bfd7013c1b0174382626ac1b8d'
'ed1341881437455d9735875ddf455fbe'
'864f268375a10f54c4daf46787e0fcf2'
@@ -132,6 +134,7 @@
'libxinerama'
'libxml2'
'libxmu'
+ 'procps-ng'
'sdl'
'shared-mime-info'
'virtualbox-host-modules')
@@ -292,7 +295,7 @@
'X-ABI-VIDEODRV_VERSION=18')
optdepends=('virtualbox-guest-dkms: Guest kernel source modules for non-stock kernels')
replaces=('virtualbox-archlinux-additions' 'virtualbox-guest-additions')
- conflicts=('virtualbox-archlinux-additions' 'virtualbox-guest-additions')
+ conflicts=('virtualbox-archlinux-additions' 'virtualbox-guest-additions' 'virtualbox-guest-utils-nox')
install=virtualbox-guest-utils.install
source "VirtualBox-$pkgver/env.sh"
@@ -310,17 +313,37 @@
ln -s /usr/lib/VBoxOGL.so "$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so"
install -m755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so"
popd
- # install udev rules
- install -Dm644 60-vboxguest.rules \
- "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
- # install systemd service file
- install -Dm644 vboxservice.service \
- "$pkgdir/usr/lib/systemd/system/vboxservice.service"
+ # systemd stuff
+ install -Dm644 60-vboxguest.rules "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
+ install -Dm644 vboxservice.service "$pkgdir/usr/lib/systemd/system/vboxservice.service"
+ install -Dm644 virtualbox-guest-utils.sysusers "$pkgdir/usr/lib/sysusers.d/virtualbox-guest-utils.conf"
# licence
install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
"$pkgdir/usr/share/licenses/$pkgname/LICENSE"
}
+package_virtualbox-guest-utils-nox() {
+ pkgdesc='VirtualBox Guest userspace utilities without X support'
+ depends=('virtualbox-guest-modules' 'gcc-libs')
+ optdepends=('virtualbox-guest-dkms: Guest kernel source modules for non-stock kernels')
+ conflicts=('virtualbox-guest-utils')
+ install=virtualbox-guest-utils.install
+
+ source "VirtualBox-$pkgver/env.sh"
+ pushd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
+ install -d "$pkgdir/usr/bin"
+ install -m755 VBoxControl VBoxService mount.vboxsf "$pkgdir/usr/bin"
+ install -m755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so"
+ popd
+ # systemd stuff
+ install -Dm644 60-vboxguest.rules "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
+ install -Dm644 vboxservice.service "$pkgdir/usr/lib/systemd/system/vboxservice.service"
+ install -Dm644 virtualbox-guest-utils.sysusers "$pkgdir/usr/lib/sysusers.d/virtualbox-guest-utils.conf"
+ # licence
+ install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
+ "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
package_virtualbox-ext-vnc() {
pkgdesc='VirtualBox VNC extension pack'
depends=('virtualbox' 'libvncserver')
Modified: virtualbox-guest-utils.install
===================================================================
--- virtualbox-guest-utils.install 2014-12-14 01:30:18 UTC (rev 123863)
+++ virtualbox-guest-utils.install 2014-12-14 02:49:46 UTC (rev 123864)
@@ -2,8 +2,7 @@
# arg 1: the new package version
post_install() {
- getent group vboxsf > /dev/null || groupadd -g 109 vboxsf
- true
+ systemd-sysusers virtualbox-guest-utils.conf
}
# arg 1: the new package version
@@ -11,21 +10,14 @@
post_upgrade() {
post_install "$1"
# rename /etc/rc.d/vboxservice
- if [ "`vercmp $2 4.1.18-3`" -lt 0 ]; then
- cat << EOF
-==> rc.d vbox-service script was renamed to vboxservice.
-EOF
+ if [[ $(vercmp "$2" 4.1.18-3) < 0 ]]; then
+ echo "==> rc.d vbox-service script was renamed to vboxservice."
fi
# fix gid of vboxsf
- if [ "`vercmp $2 4.1.18-4`" -lt 0 ]; then
+ if [[ $(vercmp "$2" 4.1.18-4) < 0 ]]; then
groupmod -g 109 vboxsf
fi
- true
+ return 0
}
-# arg 1: the old package version
-post_remove() {
- groupdel vboxsf >/dev/null 2>&1 || true
-}
-
# vim:set ts=2 sw=2 ft=sh et:
Added: virtualbox-guest-utils.sysusers
===================================================================
--- virtualbox-guest-utils.sysusers (rev 0)
+++ virtualbox-guest-utils.sysusers 2014-12-14 02:49:46 UTC (rev 123864)
@@ -0,0 +1 @@
+g vboxsf 109 -
More information about the arch-commits
mailing list