[arch-commits] Commit in virtualbox/trunk (4 files)

[Sébastien Luttringer]

    Date: Friday, May 15, 2015 @ 23:46:17
  Author: seblu
Revision: 133539

upgpkg: virtualbox 4.3.28-1

Added:
  virtualbox/trunk/virtualbox.sysusers
Modified:
  virtualbox/trunk/006-rdesktop-vrdp-keymap-path.patch
  virtualbox/trunk/PKGBUILD
  virtualbox/trunk/virtualbox.install

-------------------------------------+
 006-rdesktop-vrdp-keymap-path.patch |   10 ++++----
 PKGBUILD                            |   40 ++++++++++++++++------------------
 virtualbox.install                  |    3 --
 virtualbox.sysusers                 |    1 
 4 files changed, 26 insertions(+), 28 deletions(-)

Modified: 006-rdesktop-vrdp-keymap-path.patch
===================================================================
--- 006-rdesktop-vrdp-keymap-path.patch	2015-05-15 21:34:37 UTC (rev 133538)
+++ 006-rdesktop-vrdp-keymap-path.patch	2015-05-15 21:46:17 UTC (rev 133539)
@@ -1,12 +1,12 @@
-# 2013 © Sébastien Luttringer
---- a/src/VBox/RDP/client/Makefile.kmk	2013-02-19 23:12:20.207464901 +0100
-+++ b/src/VBox/RDP/client/Makefile.kmk	2014-01-04 04:17:26.700618600 +0100
+# 2015 © Sébastien Luttringer
+--- a/src/VBox/RDP/client-1.8.3/Makefile.kmk 2013-02-19 23:12:20.207464901 +0100
++++ b/src/VBox/RDP/client-1.8.3/Makefile.kmk 2014-01-04 04:17:26.700618600 +0100
 @@ -41,7 +41,7 @@
  	EGD_SOCKET=\"/var/run/egd-pool\" WITH_RDPSND=1 HAVE_DIRENT_H=1 \
  	HAVE_ICONV=1 HAVE_SYS_STATVFS_H=1 \
  	HAVE_SYS_PARAM_H=1 HAVE_SYS_MOUNT_H=1 HAVE_STRUCT_STATVFS_F_NAMEMAX=1 \
--	KEYMAP_PATH=$(if $(findstring RTPATH_APP_PRIVATE,$(DEFS)),RTPATH_APP_PRIVATE,\"/opt/VirtualBox\")\"/rdesktop-vrdp-keymaps\" \
-+	KEYMAP_PATH=$(if $(findstring RTPATH_APP_PRIVATE,$(DEFS)),RTPATH_APP_PRIVATE,\"/usr/share/virtualbox\")\"/rdesktop-vrdp-keymaps\" \
+-	KEYMAP_PATH=$(if $(findstring RTPATH_APP_PRIVATE,$(CDEFS)),RTPATH_APP_PRIVATE,\"/opt/VirtualBox\")\"/rdesktop-vrdp-keymaps\" \
++	KEYMAP_PATH=$(if $(findstring RTPATH_APP_PRIVATE,$(CDEFS)),RTPATH_APP_PRIVATE,\"/usr/share/virtualbox\")\"/rdesktop-vrdp-keymaps\" \
  	RDESKTOP=1
  ifdef WITH_BIRD_VD_HACKS
   rdesktop-vrdp_DEFS += WITH_BIRD_VD_HACKS

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-15 21:34:37 UTC (rev 133538)
+++ PKGBUILD	2015-05-15 21:46:17 UTC (rev 133539)
@@ -10,8 +10,8 @@
          'virtualbox-guest-utils'
          'virtualbox-guest-utils-nox'
          'virtualbox-ext-vnc')
-pkgver=4.3.26
-pkgrel=3
+pkgver=4.3.28
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -50,6 +50,7 @@
              'xorg-server-devel')
 makedepends_x86_64=('gcc-multilib' 'lib32-glibc')
 source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.tar.bz2"
+        'virtualbox.sysusers'
         'virtualbox-guest-utils.sysusers'
         '60-vboxdrv.rules'
         '60-vboxguest.rules'
@@ -65,9 +66,9 @@
         '005-gsoap-build.patch'
         '006-rdesktop-vrdp-keymap-path.patch'
         '007-python2-path.patch'
-        '008-root-window.patch'
-        '009-fix-smap-crash.patch')
-md5sums=('df8fa3b1820773556b33ae0405553120'
+        '008-root-window.patch')
+md5sums=('53dcfb7d1cf13716410f7a5de6a75fba'
+         '984412a63aa9c07ddc3cfd970381d5df'
          '4833c8e0524fd2272b24ba0d94aef006'
          '6e2722bfd7013c1b0174382626ac1b8d'
          'ed1341881437455d9735875ddf455fbe'
@@ -81,10 +82,9 @@
          '1ca474b3c236bd1ffd53ec125cdf3680'
          'a585770c6652f259c50958478b7ee735'
          'ecfd13297d7753ebe7b8763ca5b792d9'
-         '7ea75b242e19440d622eb42a4d6c62c4'
+         'd82a6f19be739341ed7f1cf4ee8070ca'
          '188ea65918309f737ce28216c2b07c3b'
-         '7495960c8fd0ac5867b6fa9cd87a64bb'
-         '1e01ddec15422708a8a795033db20b17')
+         '7495960c8fd0ac5867b6fa9cd87a64bb')
 
 prepare() {
     cd "VirtualBox-$pkgver"
@@ -122,7 +122,7 @@
     kmk
 
     msg2 'Build rdesktop-vrdp'
-    pushd src/VBox/RDP/client >/dev/null
+    pushd src/VBox/RDP/client-1.8.3 >/dev/null
     kmk
     popd >/dev/null
 
@@ -214,20 +214,19 @@
     install -dm755 "$pkgdir/etc/vbox"
     echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg"
 
+    # back to srcdir
+    cd "$srcdir"
+
     #licence
-    install -Dm644 "$srcdir/VirtualBox-$pkgver/COPYING" \
-        "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    install -Dm644 VirtualBox-$pkgver/COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 
-    # udev usb rules
-    install -Dm644 "$srcdir/60-vboxdrv.rules" \
-        "$pkgdir/usr/lib/udev/rules.d/60-vboxdrv.rules"
+    # install systemd stuff
+    install -Dm644 60-vboxdrv.rules "$pkgdir/usr/lib/udev/rules.d/60-vboxdrv.rules"
+    install -Dm644 vboxweb.service "$pkgdir/usr/lib/systemd/system/vboxweb.service"
+    install -Dm644 virtualbox.sysusers "$pkgdir/usr/lib/sysusers.d/virtualbox.conf"
 
-    # install systemd service
-    install -Dm644 "$srcdir/vboxweb.service" \
-        "$pkgdir/usr/lib/systemd/system/vboxweb.service"
-
     # install module reloading shortcut
-    install -Dm755 "$srcdir/vboxreload" "$pkgdir/usr/bin"
+    install -Dm755 vboxreload "$pkgdir/usr/bin"
 }
 
 package_virtualbox-sdk() {
@@ -319,8 +318,7 @@
     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"
+    install -Dm644 VirtualBox-$pkgver/COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
 package_virtualbox-guest-utils-nox() {

Modified: virtualbox.install
===================================================================
--- virtualbox.install	2015-05-15 21:34:37 UTC (rev 133538)
+++ virtualbox.install	2015-05-15 21:46:17 UTC (rev 133539)
@@ -20,7 +20,7 @@
 
 # arg 1:  the new package version
 post_install() {
-  getent group vboxusers >/dev/null || usr/sbin/groupadd -g 108 vboxusers
+  systemd-sysusers virtualbox.conf
   utils
 }
 
@@ -32,7 +32,6 @@
 
 # arg 1:  the old package version
 post_remove() {
-  groupdel vboxusers >/dev/null 2>&1 || true
   utils
 }
 

Added: virtualbox.sysusers
===================================================================
--- virtualbox.sysusers	                        (rev 0)
+++ virtualbox.sysusers	2015-05-15 21:46:17 UTC (rev 133539)
@@ -0,0 +1 @@
+g vboxusers 108 -