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

2020-10-20 Thread Christian Hesse via arch-commits 
Date: Tuesday, October 20, 2020 @ 19:03:15
  Author: eworm
Revision: 727661

upgpkg: virtualbox 6.1.16-1: new upstream release

Modified:
  virtualbox/trunk/PKGBUILD
Deleted:
  virtualbox/trunk/020-gsoap.patch
  virtualbox/trunk/021-kernel-5.9.patch

--+
 020-gsoap.patch  |   13 ---
 021-kernel-5.9.patch |  189 -
 PKGBUILD |   16 +---
 3 files changed, 6 insertions(+), 212 deletions(-)

Deleted: 020-gsoap.patch
===
--- 020-gsoap.patch 2020-10-20 18:58:19 UTC (rev 727660)
+++ 020-gsoap.patch 2020-10-20 19:03:15 UTC (rev 727661)
@@ -1,13 +0,0 @@
-diff --git a/src/VBox/Main/webservice/vboxweb.cpp 
b/src/VBox/Main/webservice/vboxweb.cpp
-index 8dd3ca1b..9d5c9138 100644
 a/src/VBox/Main/webservice/vboxweb.cpp
-+++ b/src/VBox/Main/webservice/vboxweb.cpp
-@@ -944,7 +944,7 @@ static void doQueuesLoop()
- if (rv == 0)
- continue; // timeout, not necessary to bother gsoap
- // r < 0, errno
--if (soap_socket_errno(soap.master) == SOAP_EINTR)
-+if (soap_socket_errno == SOAP_EINTR)
- rv = 0; // re-check if we should terminate
- break;
- }

Deleted: 021-kernel-5.9.patch
===
--- 021-kernel-5.9.patch2020-10-20 18:58:19 UTC (rev 727660)
+++ 021-kernel-5.9.patch2020-10-20 19:03:15 UTC (rev 727661)
@@ -1,189 +0,0 @@
-This patch file contains the changes needed to compile the VirtualBox
-modules for kernel 5.9.0+.
-
-The changes are as follows:
-1. The kernel headers no longer define HAVE_UNLOCKED_IOCTL; however,
-   this symbol is needed for compilation of VB.
-2. The calling sequence for get_user_pages_remote() is changed.
-3. Routine sched_setscheduler() is replaced by sched_set_fifo_low().
-4. The type of vbox_master_set() is changed from int to void.
-5. Routine drm_gem_object_put_unlocked() is replaced by drm_gem_object_put().
-6. Member offset is removed from struct ttm_buffer_object.
-
-Index: VirtualBox-6.1.14/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
-===
 VirtualBox-6.1.14.orig/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
-+++ VirtualBox-6.1.14/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h
-@@ -137,7 +137,10 @@
- #include 
- #include 
- #include 
--#ifndef HAVE_UNLOCKED_IOCTL /* linux/fs.h defines this */
-+#if RTLNX_VER_MIN(5, 9, 0)
-+#define HAVE_UNLOCKED_IOCTL 1 /* defined in linux/fs.h for kernels before 5.9 
*/
-+#endif
-+#ifndef HAVE_UNLOCKED_IOCTL
- # include 
- #endif
- /* For the shared folders module */
-Index: VirtualBox-6.1.14/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-===
 VirtualBox-6.1.14.orig/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-+++ VirtualBox-6.1.14/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-@@ -1181,7 +1181,9 @@ DECLHIDDEN(int) rtR0MemObjNativeLockUser
-  */
- else
- rc = get_user_pages_remote(
-+#ifRTLNX_VER_MAX(5, 9, 0)
- pTask,  /* Task for fault 
accounting. */
-+#endif
- pTask->mm,  /* Whose pages. */
- R3Ptr,  /* Where from. */
- cPages, /* How many pages. */
-Index: VirtualBox-6.1.14/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c
-===
 VirtualBox-6.1.14.orig/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c
-+++ VirtualBox-6.1.14/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c
-@@ -92,8 +92,12 @@ DECLHIDDEN(int) rtThreadNativeSetPriorit
- return VERR_INVALID_PARAMETER;
- }
- 
-+#if RTLNX_VER_MAX(5, 9, 0)
- sched_setscheduler(current, iSchedClass, );
- #else
-+sched_set_fifo_low(current);
-+#endif
-+#else
- RT_NOREF_PV(enmType);
- #endif
- RT_NOREF_PV(pThread);
-Index: VirtualBox-6.1.14/src/VBox/Additions/linux/drm/vbox_drv.c
-===
 VirtualBox-6.1.14.orig/src/VBox/Additions/linux/drm/vbox_drv.c
-+++ VirtualBox-6.1.14/src/VBox/Additions/linux/drm/vbox_drv.c
-@@ -262,8 +262,13 @@ static const struct file_operations vbox
-   .read = drm_read,
- };
- 
-+#if RTLNX_VER_MAX(5, 9, 0)
- static int vbox_master_set(struct drm_device *dev,
-  struct drm_file *file_priv, bool from_open)
-+#else
-+static void vbox_master_set(struct drm_device *dev,
-+  struct drm_file *file_priv, bool from_open)
-+#endif
- {
-   struct vbox_private *vbox = dev->dev_private;
- 
-Index:

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

2020-07-22 Thread Christian Hesse via arch-commits 
Date: Wednesday, July 22, 2020 @ 20:21:46
  Author: eworm
Revision: 664910

upgpkg: virtualbox 6.1.12-3: fix VBoxDRMClient race condition

Added:
  virtualbox/trunk/vboxdrmclient.path
Modified:
  virtualbox/trunk/PKGBUILD
  virtualbox/trunk/vboxservice.service

-+
 PKGBUILD|7 +--
 vboxdrmclient.path  |6 ++
 vboxservice.service |2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-07-22 19:54:40 UTC (rev 664909)
+++ PKGBUILD2020-07-22 20:21:46 UTC (rev 664910)
@@ -10,7 +10,7 @@
  'virtualbox-guest-utils-nox'
  'virtualbox-ext-vnc')
 pkgver=6.1.12
-pkgrel=2
+pkgrel=3
 _vboxsf_commit='5aba938bcabd978e4615186ad7d8617d633e6f30'
 arch=('x86_64')
 url='https://virtualbox.org/'
@@ -65,6 +65,7 @@
 'LocalConfig.kmk'
 'vboxservice.service'
 'vboxservice-nox.service'
+'vboxdrmclient.path'
 'vboxdrmclient.service'
 'vboxweb.service'
 'vboxreload'
@@ -87,8 +88,9 @@
 '9c5238183019f9ebc7d92a8582cad232f471eab9d3278786225abc1a1c7bf66e'
 '033c597e0f5285d2ddb0490868e5b6f945f45c7b1b1152a02a9e6fea438b2c95'
 '240ddf9c532b34380dd9bdd56c6302f323ded9ca95ccf5c50b6e44a5cb533cc9'
-'4ffd5b84449b07acf280126cf7e56737c6430ebb3a98d203957bcf37ecde5450'
+'c41a801fe344a4471a7b61a4764d1d857c403e4fb96e2ba6bc89c77a35f2be7a'
 '01dbb921bd57a852919cc78be5b73580a564f28ebab2fe8d6c9b8301265cbfce'
+'83d8f24bff25bb925083cf39b3195236c6136105e62417712cc3f25b92e14b47'
 '2beab8de525220fa418c9873f9e0d657ddbad4ff9e4a46d7053e6cd9bc4ce95e'
 'e6e875ef186578b53106d7f6af48e426cdaf1b4e86834f01696b8ef1c685787f'
 '4001b5927348fe669a541e80526d4f9ea91b883805f102f7d571edbb482a9b9d'
@@ -352,6 +354,7 @@
 popd
 # systemd stuff
 install -Dm0644 60-vboxguest.rules 
"$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
+install -Dm0644 vboxdrmclient.path 
"$pkgdir/usr/lib/systemd/system/vboxdrmclient.path"
 install -Dm0644 vboxdrmclient.service 
"$pkgdir/usr/lib/systemd/system/vboxdrmclient.service"
 install -Dm0644 vboxservice.service 
"$pkgdir/usr/lib/systemd/system/vboxservice.service"
 install -Dm0644 virtualbox-guest-utils.sysusers 
"$pkgdir/usr/lib/sysusers.d/virtualbox-guest-utils.conf"

Added: vboxdrmclient.path
===
--- vboxdrmclient.path  (rev 0)
+++ vboxdrmclient.path  2020-07-22 20:21:46 UTC (rev 664910)
@@ -0,0 +1,6 @@
+[Unit]
+Description=VirtualBox Guest VMSVGA resize client
+ConditionVirtualization=oracle
+
+[Path]
+PathExistsGlob=/dev/dri/renderD*

Modified: vboxservice.service
===
--- vboxservice.service 2020-07-22 19:54:40 UTC (rev 664909)
+++ vboxservice.service 2020-07-22 20:21:46 UTC (rev 664910)
@@ -1,7 +1,7 @@
 [Unit]
 Description=VirtualBox Guest Service
 ConditionVirtualization=oracle
-Wants=vboxdrmclient.service
+Wants=vboxdrmclient.path
 
 [Service]
 ExecStartPre=-/usr/bin/modprobe vboxguest

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

2020-04-15 Thread Christian Hesse via arch-commits 
Date: Wednesday, April 15, 2020 @ 10:21:58
  Author: eworm
Revision: 614573

upgpkg: virtualbox 6.1.6-1

new upstream release

Modified:
  virtualbox/trunk/PKGBUILD
Deleted:
  virtualbox/trunk/014-vboxclient.patch
  virtualbox/trunk/015-linux-5.6.patch

--+
 014-vboxclient.patch |   70 --
 015-linux-5.6.patch  |  229 -
 PKGBUILD |   10 --
 3 files changed, 3 insertions(+), 306 deletions(-)

Deleted: 014-vboxclient.patch
===
--- 014-vboxclient.patch2020-04-15 10:21:43 UTC (rev 614572)
+++ 014-vboxclient.patch2020-04-15 10:21:58 UTC (rev 614573)
@@ -1,70 +0,0 @@
 a/src/VBox/Additions/x11/VBoxClient/clipboard.cpp
-+++ b/src/VBox/Additions/x11/VBoxClient/clipboard.cpp
-@@ -107,7 +107,7 @@
- else
- #endif
- {
--uint32_t cbData = _4K; /** @ŧodo Make this dynamic. */
-+uint32_t cbData = _4K; /** @todo Make this dynamic. */
- void*pvData = RTMemAlloc(cbData);
- if (pvData)
- {
-@@ -215,7 +215,6 @@
-  *
-  * @returns VBox status code.
-  */
--#if 0
- static int vboxClipboardConnect(void)
- {
- LogFlowFuncEnter();
-@@ -245,7 +244,6 @@
- LogFlowFuncLeaveRC(rc);
- return rc;
- }
--#endif
- 
- /**
-  * The main loop of our clipboard reader.
-@@ -469,7 +467,7 @@
- RT_NOREF(ppInterface, fDaemonised);
- 
- /* Initialise the guest library. */
--int rc = 0; //vboxClipboardConnect();
-+int rc = vboxClipboardConnect();
- if (RT_SUCCESS(rc))
- {
- #ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE
-@@ -477,10 +475,8 @@
- if (RT_SUCCESS(rc))
- {
- #endif
--RTThreadSleep(60 * 1000);
-+rc = vboxClipboardMain();
- 
--//rc = vboxClipboardMain();
--
- #ifdef VBOX_WITH_SHARED_CLIPBOARD_FUSE
- int rc2 = vboxClipboardFUSEStop();
- if (RT_SUCCESS(rc))
 a/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp
-+++ b/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp
-@@ -100,16 +100,19 @@ static void x11Connect(struct X11CONTEXT
- {
- XCloseDisplay(pContext->pDisplay);
- pContext->pDisplay = NULL;
-+return;
- }
- if (!XRRQueryExtension(pContext->pDisplay, >hRandREventBase, 
>hRandRErrorBase))
- {
- XCloseDisplay(pContext->pDisplay);
- pContext->pDisplay = NULL;
-+return;
- }
- if (!XRRQueryVersion(pContext->pDisplay, >hRandRMajor, 
>hRandRMinor))
- {
- XCloseDisplay(pContext->pDisplay);
- pContext->pDisplay = NULL;
-+return;
- }
- pContext->rootWindow = DefaultRootWindow(pContext->pDisplay);
- }

Deleted: 015-linux-5.6.patch
===
--- 015-linux-5.6.patch 2020-04-15 10:21:43 UTC (rev 614572)
+++ 015-linux-5.6.patch 2020-04-15 10:21:58 UTC (rev 614573)
@@ -1,229 +0,0 @@
-Index: a/include/iprt/time.h
-===
 a/include/iprt/time.h  (revision 82968)
-+++ a/include/iprt/time.h  (revision 83471)
-@@ -359,6 +359,12 @@
- /* PORTME: Add struct timeval guard macro here. */
- #if defined(RTTIME_INCL_TIMEVAL) || defined(_STRUCT_TIMEVAL) || 
defined(_SYS__TIMEVAL_H_) || defined(_SYS_TIME_H) || defined(_TIMEVAL) || 
defined(_LINUX_TIME_H) \
-  || (defined(RT_OS_NETBSD) && defined(_SYS_TIME_H_))
-+/*
-+ * Starting with Linux kernel version 5.6-rc3, the struct timeval is no longer
-+ * available to kernel code and must not be used in kernel code.
-+ * Only 64-bit time-interfaces are allowed into the kernel.
-+ */
-+# if defined(RT_OS_LINUX) && (!defined(__KERNEL__) || 
!defined(_LINUX_TIME64_H))
- /**
-  * Gets the time as POSIX timeval.
-  *
-@@ -392,6 +398,7 @@
- {
- return RTTimeSpecAddMicro(RTTimeSpecSetSeconds(pTime, pTimeval->tv_sec), 
pTimeval->tv_usec);
- }
-+# endif /* RT_OS_LINUX ... */
- #endif /* various ways of detecting struct timeval */
- 
- 
-@@ -431,15 +438,19 @@
- {
- return RTTimeSpecAddNano(RTTimeSpecSetSeconds(pTime, pTimespec->tv_sec), 
pTimespec->tv_nsec);
- }
--
--
--# ifdef _LINUX_TIME64_H
-+#endif /* various ways of detecting struct timespec */
-+
-+#if defined(RT_OS_LINUX) && defined(_LINUX_TIME64_H)
-+/*
-+ * Starting with Linux kernel version 5.6-rc3, the _STRUCT_TIMESPEC is only 
defined
-+ * under !__KERNEL__ guard and _LINUX_TIME64_H does not define a corresponding
-+ * _STRUCT_TIMESPEC64. Only 64-bit time-interfaces are now allowed into the 
kernel.
-+ */
- DECLINLINE(PRTTIMESPEC) RTTimeSpecSetTimespec64(PRTTIMESPEC pTime, const 
struct timespec64 *pTimeval)
- {
- return RTTimeSpecAddNano(RTTimeSpecSetSeconds(pTime, pTimeval->tv_sec), 
pTimeval->tv_nsec);
- }
--# endif
--#endif /* various ways of detecting struct timespec */
-+#endif /* RT_OS_LINUX && _LINUX_TIME64_H */
- 
- 
- 
-Index:

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

2020-04-01 Thread Christian Hesse via arch-commits 
Date: Wednesday, April 1, 2020 @ 12:32:44
  Author: eworm
Revision: 608876

upgpkg: virtualbox 6.1.4-5

clean up dkms stuff

Modified:
  virtualbox/trunk/PKGBUILD
  virtualbox/trunk/virtualbox-vboxsf-dkms.conf
Deleted:
  virtualbox/trunk/virtualbox-guest-dkms.conf

-+
 PKGBUILD|   14 --
 virtualbox-guest-dkms.conf  |   34 --
 virtualbox-vboxsf-dkms.conf |2 +-
 3 files changed, 5 insertions(+), 45 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-01 12:28:32 UTC (rev 608875)
+++ PKGBUILD2020-04-01 12:32:44 UTC (rev 608876)
@@ -10,7 +10,7 @@
  'virtualbox-guest-utils-nox'
  'virtualbox-ext-vnc')
 pkgver=6.1.4
-pkgrel=4
+pkgrel=5
 _vboxsf_commit='5aba938bcabd978e4615186ad7d8617d633e6f30'
 arch=('x86_64')
 url='https://virtualbox.org/'
@@ -57,7 +57,6 @@
 # https://bugzilla.redhat.com/show_bug.cgi?id=1481630#c65
 "git+https://github.com/jwrdegoede/vboxsf#commit=$_vboxsf_commit;
 'virtualbox-host-dkms.conf'
-'virtualbox-guest-dkms.conf'
 'virtualbox-vboxsf-dkms.conf'
 'virtualbox.sysusers'
 'virtualbox-guest-utils.sysusers'
@@ -83,8 +82,7 @@
 sha256sums=('59f8f5774473f593e3eb5940e2a337e0674bcd9854164b2578fd43f896260c99'
 'SKIP'
 '76d98ea062fcad9e5e3fa981d046a6eb12a3e718a296544a68b66f4b65cb56db'
-'c328376b05183d269f98319ec660f54c55e298f77d229977606862b064651a7c'
-'e37712bcbbafbdee47230a962446d63b0ae882801a89931d93ad9e704e70ad4b'
+'c1ccfaa3a37d6b227cd65de944df2d68cbf178a857b6ab15c04b8fa05693f252'
 '2101ebb58233bbfadf3aa74381f22f7e7e508559d2b46387114bc2d8e308554c'
 'da4c49f6ca94e047e196cdbcba2c321199f4760056ea66e0fbc659353e128c9e'
 '9c5238183019f9ebc7d92a8582cad232f471eab9d3278786225abc1a1c7bf66e'
@@ -311,7 +309,7 @@
 install -dm0755 "$pkgdir/usr/src"
 source "VirtualBox-$pkgver/env.sh"
 cd 
"VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
-cp -r src "$pkgdir/usr/src/vboxguest-${pkgver}_OSE"
+
 # licence
 install -Dm0644 "$srcdir/VirtualBox-$pkgver/COPYING" \
 "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
@@ -319,12 +317,8 @@
 local _p="$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
 install -Dm0644 /dev/null "$_p"
 printf "vboxguest\nvboxsf\nvboxvideo\n" > "$_p"
-# starting vbox 5.1, dkms.conf file was dropped
-local _p="$pkgdir/usr/src/vboxguest-${pkgver}_OSE/dkms.conf"
-install -Dm0644 "$srcdir/$pkgname.conf" "$_p"
-sed -i "s,@VERSION@,$pkgver," "$_p"
 
-# vboxsf module for Linux 4.16 and later
+# vboxsf module for Linux 4.16 to Linux 5.5
 install -d "$pkgdir/usr/src/vboxsf-${pkgver}_OSE"
 cp -rT "$srcdir/vboxsf" "$pkgdir/usr/src/vboxsf-${pkgver}_OSE/vboxsf"
 rm -rf "$pkgdir/usr/src/vboxsf-${pkgver}_OSE/vboxsf/.git"

Deleted: virtualbox-guest-dkms.conf
===
--- virtualbox-guest-dkms.conf  2020-04-01 12:28:32 UTC (rev 608875)
+++ virtualbox-guest-dkms.conf  2020-04-01 12:32:44 UTC (rev 608876)
@@ -1,34 +0,0 @@
-## @file
-# Linux DKMS config script for the VirtualBox guest kernel modules
-#
-
-#
-# Copyright (C) 2006-2015 Oracle Corporation
-#
-# This file is part of VirtualBox Open Source Edition (OSE), as
-# available from http://www.virtualbox.org. This file is free software;
-# you can redistribute it and/or modify it under the terms of the GNU
-# General Public License (GPL) as published by the Free Software
-# Foundation, in version 2 as it comes in the "COPYING" file of the
-# VirtualBox OSE distribution. VirtualBox OSE is distributed in the
-# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
-#
-
-PACKAGE_NAME="vboxguest"
-PACKAGE_VERSION=@VERSION@_OSE
-AUTOINSTALL=yes
-
-# Build only for kernels before Linux 4.16
-BUILD_EXCLUSIVE_KERNEL="^(4\.[0-9]\..*|4\.1[0-5]\..*|3\..*)"
-
-BUILT_MODULE_NAME[0]="vboxguest"
-BUILT_MODULE_LOCATION[0]="vboxguest"
-DEST_MODULE_LOCATION[0]="/kernel/misc"
-
-BUILT_MODULE_NAME[1]="vboxsf"
-BUILT_MODULE_LOCATION[1]="vboxsf"
-DEST_MODULE_LOCATION[1]="/kernel/misc"
-
-BUILT_MODULE_NAME[2]="vboxvideo"
-BUILT_MODULE_LOCATION[2]="vboxvideo"
-DEST_MODULE_LOCATION[2]="/kernel/misc"

Modified: virtualbox-vboxsf-dkms.conf
===
--- virtualbox-vboxsf-dkms.conf 2020-04-01 12:28:32 UTC (rev 608875)
+++ virtualbox-vboxsf-dkms.conf 2020-04-01 12:32:44 UTC (rev 608876)
@@ -3,7 +3,7 @@
 AUTOINSTALL=yes
 
 # Build only for Linux 4.16 and later (until it gets upstreamed...)
-BUILD_EXCLUSIVE_KERNEL="^(4\.(1[6-9]|2[0-9])\..*|5\..*)"
+BUILD_EXCLUSIVE_KERNEL="^(4\.(1[6-9]|2[0-9])\..*|5\.[0-5]\..*)"
 
 BUILT_MODULE_NAME[0]="vboxsf"
 BUILT_MODULE_LOCATION[0]="vboxsf"

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

2019-10-26 Thread Antonio Rojas via arch-commits 
Date: Saturday, October 26, 2019 @ 11:15:40
  Author: arojas
Revision: 520339

Support python 3.8

Added:
  virtualbox/trunk/011-python-3-8.patch
(from rev 520338, virtualbox/trunk/011-python-3-7.patch)
Modified:
  virtualbox/trunk/PKGBUILD
Deleted:
  virtualbox/trunk/011-python-3-7.patch

--+
 011-python-3-7.patch |   13 -
 011-python-3-8.patch |   13 +
 PKGBUILD |4 ++--
 3 files changed, 15 insertions(+), 15 deletions(-)

Deleted: 011-python-3-7.patch
===
--- 011-python-3-7.patch2019-10-26 10:00:36 UTC (rev 520338)
+++ 011-python-3-7.patch2019-10-26 11:15:40 UTC (rev 520339)
@@ -1,13 +0,0 @@
-diff --git a/configure b/configure
-index 128da55c..c4bb08c4 100755
 a/configure
-+++ b/configure
-@@ -1969,7 +1969,7 @@ extern "C" int main(void)
- }
- EOF
-   found=
--  SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 
python3.4m python3.5 python3.5m python3.6 python3.6m"
-+  SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 
python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m"
-   for p in $PYTHONDIR; do
- for d in $SUPPYTHONLIBS; do
-   for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do

Copied: virtualbox/trunk/011-python-3-8.patch (from rev 520338, 
virtualbox/trunk/011-python-3-7.patch)
===
--- 011-python-3-8.patch(rev 0)
+++ 011-python-3-8.patch2019-10-26 11:15:40 UTC (rev 520339)
@@ -0,0 +1,13 @@
+diff --git a/configure b/configure
+index 128da55c..c4bb08c4 100755
+--- a/configure
 b/configure
+@@ -1969,7 +1969,7 @@ extern "C" int main(void)
+ }
+ EOF
+   found=
+-  SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 
python3.4m python3.5 python3.5m python3.6 python3.6m"
++  SUPPYTHONLIBS="python2.7 python2.6 python3.1 python3.2 python3.3 python3.4 
python3.4m python3.5 python3.5m python3.6 python3.6m python3.7 python3.7m 
python3.8"
+   for p in $PYTHONDIR; do
+ for d in $SUPPYTHONLIBS; do
+   for b in lib/x86_64-linux-gnu lib/i386-linux-gnu lib64 lib/64 lib; do

Modified: PKGBUILD
===
--- PKGBUILD2019-10-26 10:00:36 UTC (rev 520338)
+++ PKGBUILD2019-10-26 11:15:40 UTC (rev 520339)
@@ -72,7 +72,7 @@
 '005-gsoap-build.patch'
 '006-rdesktop-vrdp-keymap-path.patch'
 '008-no-vboxvideo.patch'
-'011-python-3-7.patch'
+'011-python-3-8.patch'
 '012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch'
 '013-Makefile.patch'
 '014-iasl.patch'
@@ -98,7 +98,7 @@
 '7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46'
 '13c6ca9be0f91582445fd2a14a8c58a0625a15d9cb98cb6e8c2736d77ea976ab'
 '8b7f241107863f82a5b0ae336aead0b3366a40103ff72dbebf33f54b512a0cbc'
-'55224cb74b54b331d691f171efc0d4c058a14f738551f1d8f559146c2908635d'
+'3dccf97c482d3a0ba0f0aea82bd9cdbd53235bfd48f0178ff52cb98c2f8491f0'
 '81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024'
 'da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9'
 '5ad14bd587031ac3dcadaeca2cc4d7b48a59ff09b03884b4fc2be5b1432a8237'

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

2019-01-15 Thread Christian Hesse via arch-commits 
Date: Tuesday, January 15, 2019 @ 21:24:17
  Author: eworm
Revision: 423373

upgpkg: virtualbox 6.0.2-1

new upstream release

Modified:
  virtualbox/trunk/006-rdesktop-vrdp-keymap-path.patch
  virtualbox/trunk/PKGBUILD
Deleted:
  virtualbox/trunk/010-qt-5.11.patch

-+
 006-rdesktop-vrdp-keymap-path.patch |4 ++--
 010-qt-5.11.patch   |   11 ---
 PKGBUILD|   12 +---
 3 files changed, 7 insertions(+), 20 deletions(-)

Modified: 006-rdesktop-vrdp-keymap-path.patch
===
--- 006-rdesktop-vrdp-keymap-path.patch 2019-01-15 20:44:51 UTC (rev 423372)
+++ 006-rdesktop-vrdp-keymap-path.patch 2019-01-15 21:24:17 UTC (rev 423373)
@@ -1,6 +1,6 @@
 # 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
+--- a/src/VBox/RDP/client-1.8.4/Makefile.kmk
 b/src/VBox/RDP/client-1.8.4/Makefile.kmk
 @@ -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 \

Deleted: 010-qt-5.11.patch
===
--- 010-qt-5.11.patch   2019-01-15 20:44:51 UTC (rev 423372)
+++ 010-qt-5.11.patch   2019-01-15 21:24:17 UTC (rev 423373)
@@ -1,11 +0,0 @@
-diff -u -r 
VirtualBox-5.2.12/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
 
VirtualBox-5.2.12-qt/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
 
VirtualBox-5.2.12/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
  2018-05-09 18:38:05.0 +0200
-+++ 
VirtualBox-5.2.12-qt/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsProxy.cpp
   2018-06-05 21:51:18.401913367 +0200
-@@ -21,6 +21,7 @@
- 
- /* Qt includes: */
- # include 
-+# include 
- 
- /* GUI includes: */
- # include "QIWidgetValidator.h"

Modified: PKGBUILD
===
--- PKGBUILD2019-01-15 20:44:51 UTC (rev 423372)
+++ PKGBUILD2019-01-15 21:24:17 UTC (rev 423373)
@@ -9,8 +9,8 @@
  'virtualbox-guest-utils'
  'virtualbox-guest-utils-nox'
  'virtualbox-ext-vnc')
-pkgver=6.0.0
-pkgrel=3
+pkgver=6.0.2
+pkgrel=1
 _vboxsf_commit='9451f61e6787e95aa51e42b6381db6b059bc49da'
 arch=('x86_64')
 url='http://virtualbox.org'
@@ -74,7 +74,6 @@
 '006-rdesktop-vrdp-keymap-path.patch'
 '008-no-vboxvideo.patch'
 '009-include-path.patch'
-'010-qt-5.11.patch'
 '011-python-3-7.patch'
 '012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch'
 # The following patch and mount.vboxsf wrapper should be removed
@@ -81,7 +80,7 @@
 # once support for mainline-style options string gets upstreamed
 '101-vboxsf-automount.patch'
 'mount.vboxsf')
-sha256sums=('de47ce3ba599e0c5ef24eb44728fcf4abdecb0f0bb60e8560d03cfbf41283bfb'
+sha256sums=('fa31b4c6cf94ac908cf89d290cab5795c86d6307cd3857b31ae85faa1eaf0c81'
 'SKIP'
 'deb03efa7ad0376aa55a087f2e882afe00935f10b0e7aa853ba9147090d341ec'
 'c328376b05183d269f98319ec660f54c55e298f77d229977606862b064651a7c'
@@ -97,10 +96,9 @@
 '2a9d7748dc58f9d091f791da06b733a696943114f7c0d580fa00a0752eb1d2ac'
 'f67674931c30187f867233e3a4ae662f93c9110fbd0bfce50dd9f391f4533bc0'
 '7d2da8fe10a90f76bbfc80ad1f55df4414f118cd10e10abfb76070326abebd46'
-'5d5af2de5b1f1c61ec793503350f2440661cf8fd640f11b8a86f10bce499c0dc'
+'13c6ca9be0f91582445fd2a14a8c58a0625a15d9cb98cb6e8c2736d77ea976ab'
 '8b7f241107863f82a5b0ae336aead0b3366a40103ff72dbebf33f54b512a0cbc'
 '1acc7014bcb3d9ca6da29eed813c3d6e91a688c43f9d93802fd4e3814f67ace4'
-'c6ef35e6893d557c7c2269ff79bc299fe9058cfb2c933a7efdc7a8a7b6d9c5da'
 '55224cb74b54b331d691f171efc0d4c058a14f738551f1d8f559146c2908635d'
 '81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024'
 'a784f3cc24652a16385cc63abac6c5178932ca5f3861be7650631b7dafa753a4'
@@ -142,7 +140,7 @@
 kmk
 
 msg2 'Build rdesktop-vrdp'
-kmk -C src/VBox/RDP/client-1.8.3
+kmk -C src/VBox/RDP/client-1.8.4
 
 msg2 'Build VNC extension pack'
 kmk -C src/VBox/ExtPacks/VNC packing

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

2018-04-17 Thread Christian Hesse via arch-commits 
Date: Tuesday, April 17, 2018 @ 21:20:34
  Author: eworm
Revision: 316824

upgpkg: virtualbox 5.2.10-1

new upstream release

Added:
  virtualbox/trunk/010-linux-4.16-mount-fixes.patch
(from rev 316823, virtualbox/trunk/linux-4.16-mount-fixes.patch)
Modified:
  virtualbox/trunk/PKGBUILD
Deleted:
  virtualbox/trunk/linux-4.16-mount-fixes.patch

--+
 010-linux-4.16-mount-fixes.patch |   35 +++
 PKGBUILD |   24 
 linux-4.16-mount-fixes.patch |   35 ---
 3 files changed, 47 insertions(+), 47 deletions(-)

Copied: virtualbox/trunk/010-linux-4.16-mount-fixes.patch (from rev 316823, 
virtualbox/trunk/linux-4.16-mount-fixes.patch)
===
--- 010-linux-4.16-mount-fixes.patch(rev 0)
+++ 010-linux-4.16-mount-fixes.patch2018-04-17 21:20:34 UTC (rev 316824)
@@ -0,0 +1,35 @@
+This ghetto patch attempts to fix shared folder automounting for guests running
+Linux 4.16, and also suggests an alternative to mount.vboxsf.
+
+diff -uprb 
VirtualBox-5.2.8.orig/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
 VirtualBox-5.2.8/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
+--- 
VirtualBox-5.2.8.orig/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp
   2018-02-26 17:57:30.0 +0200
 
VirtualBox-5.2.8/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp 
   2018-04-07 21:00:05.785735622 +0300
+@@ -346,6 +346,13 @@ static int vbsvcAutoMountSharedFolder(co
+   "vboxsf",
+   fFlags,
+   );
++if (r == -1 && errno == EINVAL)
++{
++/* Mainline vboxsf accepts regular mount opts. */
++char mount_opts[1024];
++snprintf(mount_opts, 1024, "gid=%d,dmode=0770,fmode=0770", 
mntinf.gid);
++r = mount(pszShareName, pszMountPoint, "vboxsf", fFlags, 
mount_opts);
++}
+ if (r == 0)
+ {
+ VGSvcVerbose(0, "vbsvcAutoMountWorker: Shared folder '%s' was 
mounted to '%s'\n", pszShareName, pszMountPoint);
+diff -uprb 
VirtualBox-5.2.8.orig/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c 
VirtualBox-5.2.8/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c
+--- 
VirtualBox-5.2.8.orig/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c 
   2018-02-26 17:57:34.0 +0200
 VirtualBox-5.2.8/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c 
2018-04-07 21:39:38.121577588 +0300
+@@ -485,6 +485,11 @@ main(int argc, char **argv)
+  *   to keep this code here slick without having VbglR3.
+  */
+ err = mount(host_name, mount_point, "vboxsf", flags, );
++if (err == -1 && errno == EINVAL)
++{
++/* The mount.vboxsf helper should not be used with mainline vboxsf. */
++panic("mount.vboxsf cannot be used with mainline vboxsf; instead 
use:\n\nmount -cit vboxsf NAME MOUNTPOINT\n\n");
++}
+ if (err == -1 && errno == EPROTO)
+ {
+ /* Sometimes the mount utility messes up the share name.  Try to

Modified: PKGBUILD
===
--- PKGBUILD2018-04-17 21:09:24 UTC (rev 316823)
+++ PKGBUILD2018-04-17 21:20:34 UTC (rev 316824)
@@ -10,8 +10,9 @@
  'virtualbox-guest-utils'
  'virtualbox-guest-utils-nox'
  'virtualbox-ext-vnc')
-pkgver=5.2.8
-pkgrel=2
+pkgver=5.2.10
+pkgrel=1
+_vboxsf_commit='6a782003ad95a383c8b19b570a532271f090ad35'
 arch=('x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -53,8 +54,12 @@
  'xorg-server-devel')
 makedepends_x86_64=('gcc-multilib' 'lib32-glibc')
 
source=("http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2;
+# We need to build a modified version of vboxsf for Linux 4.16
+# https://bugzilla.redhat.com/show_bug.cgi?id=1481630#c65
+"git+https://github.com/jwrdegoede/vboxsf#commit=$_vboxsf_commit;
 'virtualbox-host-dkms.conf'
 'virtualbox-guest-dkms.conf'
+'virtualbox-vboxsf-4.16-dkms.conf'
 'virtualbox.sysusers'
 'virtualbox-guest-utils.sysusers'
 '60-vboxdrv.rules'
@@ -70,15 +75,12 @@
 '007-python2-path.patch'
 '008-no-vboxvideo.patch'
 '009-include-path.patch'
-'linux-4.16-mount-fixes.patch'
-# We need to build a modified version of vboxsf for Linux 4.16
-# https://bugzilla.redhat.com/show_bug.cgi?id=1481630#c65
-"git+https://github.com/jwrdegoede/vboxsf#commit=$_vboxsf_commit;
-'virtualbox-vboxsf-4.16-dkms.conf'
-)
-sha256sums=('ee2759d47b0b4ac81b8b671c9485c87fb2db12c097b3e7e69b94c1291a8084e8'
+'010-linux-4.16-mount-fixes.patch')

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

2017-10-18 Thread Christian Hesse 
Date: Wednesday, October 18, 2017 @ 22:05:39
  Author: eworm
Revision: 263305

upgpkg: virtualbox 5.2.0-1

new upstream release

Added:
  virtualbox/trunk/009-include-path.patch
Modified:
  virtualbox/trunk/PKGBUILD
Deleted:
  virtualbox/trunk/003-ogl-include-path.patch

+
 003-ogl-include-path.patch |   43 -
 009-include-path.patch |   85 +++
 PKGBUILD   |   11 +++--
 3 files changed, 92 insertions(+), 47 deletions(-)

Deleted: 003-ogl-include-path.patch
===
--- 003-ogl-include-path.patch  2017-10-18 21:45:06 UTC (rev 263304)
+++ 003-ogl-include-path.patch  2017-10-18 22:05:39 UTC (rev 263305)
@@ -1,43 +0,0 @@
-Index: virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk
-===
 virtualbox.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk
2015-04-02 15:44:24.955670965 +0200
-+++ virtualbox/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2015-04-02 
15:44:24.955670965 +0200
-@@ -67,18 +67,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
- 
-@@ -213,10 +207,10 @@
- 
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
-  VBoxOGL_LIBS += \
--  $(PATH_STAGE_LIB)/libXcomposite.so \
--  $(PATH_STAGE_LIB)/libXdamage.so \
--  $(PATH_STAGE_LIB)/libXfixes.so \
--  $(PATH_STAGE_LIB)/libXext.so
-+  Xcomposite \
-+  Xdamage \
-+  Xfixes \
-+  Xext
-  ifdef VBoxOGL_FAKEDRI
-   ifeq ($(KBUILD_TARGET), freebsd)
- VBoxOGL_LIBS += \

Added: 009-include-path.patch
===
--- 009-include-path.patch  (rev 0)
+++ 009-include-path.patch  2017-10-18 22:05:39 UTC (rev 263305)
@@ -0,0 +1,85 @@
+diff --git a/src/VBox/HostDrivers/Support/linux/Makefile 
b/src/VBox/HostDrivers/Support/linux/Makefile
+index d199047..34d895f 100644
+--- a/src/VBox/HostDrivers/Support/linux/Makefile
 b/src/VBox/HostDrivers/Support/linux/Makefile
+@@ -131,7 +131,7 @@ ifdef VBOX_WITH_NATIVE_DTRACE
+  MOD_OBJS += SUPDrvDTrace.o
+ endif
+ 
+-MOD_INCL  = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
++MOD_INCL  = $(addprefix -I$(KBUILD_EXTMOD)/vboxdrv,/ /include /r0drv/linux)
+ ifdef VBOX_WITH_NATIVE_DTRACE
+  MOD_INCL += -I/usr/include/linux -I/usr/include
+ endif
+@@ -157,7 +157,7 @@ ifdef VBOX_WITH_TEXT_MODMEM_HACK
+ endif
+ 
+ # build defs
+-MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h \
++MOD_CFLAGS = -include $(KBUILD_EXTMOD)/vboxdrv/include/VBox/SUPDrvMangling.h \
+   -fno-omit-frame-pointer -fno-pie
+ 
+ include $(obj)/Makefile.include.footer
+diff --git a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile 
b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
+index 694cb5c..8487820 100644
+--- a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
 b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile
+@@ -34,7 +34,7 @@ MOD_OBJS += math/gcc/divdi3.o \
+   math/gcc/umoddi3.o
+ endif
+ 
+-MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
++MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD)/vboxnetadp,/ /include /r0drv/linux)
+ MOD_DEFS = -DRT_OS_LINUX -DIN_RING0 -DIN_RT_R0 -DIN_SUP_R0 -DVBOX \
+   -DRT_WITH_VBOX -DVBOX_WITH_HARDENING \
+   -Wno-declaration-after-statement
+@@ -59,6 +59,6 @@ ifdef VBOX_USE_INSERT_PAGE
+ endif
+ 
+ # build defs
+-MOD_CFLAGS = -include $(KBUILD_EXTMOD)/include/VBox/SUPDrvMangling.h -fno-pie
++MOD_CFLAGS = -include 
$(KBUILD_EXTMOD)/vboxnetadp/include/VBox/SUPDrvMangling.h -fno-pie
+ 
+ include $(obj)/Makefile.include.footer
+diff --git a/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile 
b/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
+index e262c61..ca956d5 100644
+--- a/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
 b/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile
+@@ -38,7 +38,7 @@ MOD_OBJS += math/gcc/divdi3.o \
+   math/gcc/umoddi3.o
+ endif
+ 
+-MOD_INCL = $(addprefix -I$(KBUILD_EXTMOD),/ /include /r0drv/linux)
++MOD_INCL = $(addprefix

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

2017-07-18 Thread Christian Hesse 
Date: Tuesday, July 18, 2017 @ 12:18:14
  Author: eworm
Revision: 245542

upgpkg: virtualbox 5.1.24-1

new upstream release

Modified:
  virtualbox/trunk/PKGBUILD
Deleted:
  virtualbox/trunk/009-gcc-7.patch
  virtualbox/trunk/010-linux-4.12.patch

--+
 009-gcc-7.patch  |  303 -
 010-linux-4.12.patch |  108 -
 PKGBUILD |   10 -
 3 files changed, 3 insertions(+), 418 deletions(-)

Deleted: 009-gcc-7.patch
===
--- 009-gcc-7.patch 2017-07-18 11:32:13 UTC (rev 245541)
+++ 009-gcc-7.patch 2017-07-18 12:18:14 UTC (rev 245542)
@@ -1,303 +0,0 @@
-Index: trunk/src/recompiler/Makefile.kmk
-===
 trunk/src/recompiler/Makefile.kmk  (revision 67289)
-+++ trunk/src/recompiler/Makefile.kmk  (revision 67298)
-@@ -320,7 +320,8 @@
- 
- $$(VBoxREMImp_0_OUTDIR)/VBoxREMRes.o: $(VBOX_PATH_RECOMPILER_SRC)/VBoxREM.rc 
$(MAKEFILE_CURRENT) $(VBOX_VERSION_MK) | $$(dir $$@)
-   $(call MSG_GENERATE,,$@)
--  $(QUIET)$(REDIRECT) -E 'COMSPEC=$(VBOX_GOOD_COMSPEC_BS)' -- 
$(TOOL_MINGWW64_PREFIX)windres \
-+  $(QUIET)$(REDIRECT) -E 'COMSPEC=$(VBOX_GOOD_COMSPEC_BS)' \
-+  -- 
$(TOOL_$(VBoxRemPrimary_TOOL.win.$(KBUILD_TARGET_ARCH))_PREFIX)windres \
-   $(addprefix -I,$(INCS) $(PATH_SDK_$(VBOX_WINPSDK)_INC) 
$(PATH_TOOL_$(VBOX_VCC_TOOL)_INC)) \
-   -DVBOX_SVN_REV=$(VBOX_SVN_REV) \
-   -DVBOX_SVN_REV_MOD_5K=$(expr $(VBOX_SVN_REV) % 5) \
-Index: trunk/src/VBox/Runtime/common/math/gcc/udivmoddi4.c
-===
 trunk/src/VBox/Runtime/common/math/gcc/udivmoddi4.c(nonexistent)
-+++ trunk/src/VBox/Runtime/common/math/gcc/udivmoddi4.c(revision 67298)
-@@ -0,0 +1,53 @@
-+/* $Id$ */
-+/** @file
-+ * IPRT - __udivmoddi4 implementation
-+ */
-+
-+/*
-+ * Copyright (C) 2006-2016 Oracle Corporation
-+ *
-+ * This file is part of VirtualBox Open Source Edition (OSE), as
-+ * available from http://www.virtualbox.org. This file is free software;
-+ * you can redistribute it and/or modify it under the terms of the GNU
-+ * General Public License (GPL) as published by the Free Software
-+ * Foundation, in version 2 as it comes in the "COPYING" file of the
-+ * VirtualBox OSE distribution. VirtualBox OSE is distributed in the
-+ * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
-+ *
-+ * The contents of this file may alternatively be used under the terms
-+ * of the Common Development and Distribution License Version 1.0
-+ * (CDDL) only, as it comes in the "COPYING.CDDL" file of the
-+ * VirtualBox OSE distribution, in which case the provisions of the
-+ * CDDL are applicable instead of those of the GPL.
-+ *
-+ * You may elect to license modified versions of this file under the
-+ * terms and conditions of either the GPL or the CDDL or both.
-+ */
-+
-+#include 
-+#include 
-+
-+uint64_t __udivmoddi4(uint64_t u64A, uint64_t u64B, uint64_t *pu64R);
-+
-+/**
-+ * __udivmoddi4() implementation to satisfy external references from 32-bit
-+ * code generated by gcc-7 or later.
-+ *
-+ * @param   u64AThe divident value.
-+ * @param   u64BThe divisor value.
-+ * @param   pu64R   A pointer to the reminder. May be NULL.
-+ * @returns u64A / u64B
-+ */
-+uint64_t __udivmoddi4(uint64_t u64A, uint64_t u64B, uint64_t *pu64R)
-+{
-+RTUINT64U Divident;
-+RTUINT64U Divisor;
-+RTUINT64U Quotient;
-+RTUINT64U Reminder;
-+Divident.u = u64A;
-+Divisor.u  = u64B;
-+RTUInt64DivRem(, , , );
-+if (pu64R)
-+*pu64R = Reminder.u;
-+return Quotient.u;
-+}
-
-Property changes on: trunk/src/VBox/Runtime/common/math/gcc/udivmoddi4.c
-___
-Added: svn:eol-style
-## -0,0 +1 ##
-+native
-\ No newline at end of property
-Added: svn:keywords
-## -0,0 +1 ##
-+Author Date Id Revision
-\ No newline at end of property
-Index: trunk/src/VBox/Runtime/Makefile.kmk
-===
 trunk/src/VBox/Runtime/Makefile.kmk(revision 67289)
-+++ trunk/src/VBox/Runtime/Makefile.kmk(revision 67298)
-@@ -1850,6 +1850,7 @@
-   common/math/gcc/subdi3.c \
-   common/math/gcc/ucmpdi2.c \
-   common/math/gcc/udivdi3.c \
-+  common/math/gcc/udivmoddi4.c \
-   common/math/gcc/umoddi3.c \
-   common/math/gcc/xordi3.c
- 
-@@ -1942,6 +1943,7 @@
-   common/math/gcc/subdi3.c \
-   common/math/gcc/ucmpdi2.c \
-   common/math/gcc/udivdi3.c \
-+  common/math/gcc/udivmoddi4.c \
-   common/math/gcc/umoddi3.c \
-   common/math/gcc/xordi3.c
- endif
-@@ -2675,6 +2677,7 @@
-   common/math/gcc/subdi3.c \
-   common/math/gcc/ucmpdi2.c \
-   common/math/gcc/udivdi3.c \
-+  common/math/gcc/udivmoddi4.c

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

2016-11-21 Thread Christian Hesse 
Date: Monday, November 21, 2016 @ 22:29:34
  Author: eworm
Revision: 196483

upgpkg: virtualbox 5.1.10-1

new upstream release

Modified:
  virtualbox/trunk/PKGBUILD
Deleted:
  virtualbox/trunk/008-no-legacy-xorg.patch
  virtualbox/trunk/009-linux-4-9.patch

--+
 008-no-legacy-xorg.patch |   52 -
 009-linux-4-9.patch  |   37 
 PKGBUILD |   10 ++--
 3 files changed, 3 insertions(+), 96 deletions(-)

Deleted: 008-no-legacy-xorg.patch
===
--- 008-no-legacy-xorg.patch2016-11-21 22:14:38 UTC (rev 196482)
+++ 008-no-legacy-xorg.patch2016-11-21 22:29:34 UTC (rev 196483)
@@ -1,52 +0,0 @@
-diff --git a/Config.kmk b/Config.kmk
-index 94b1dc8..1062da7 100644
 a/Config.kmk
-+++ b/Config.kmk
-@@ -2365,15 +2365,15 @@ ifdef VBOX_WITH_CROGL
-  endif
- 
-  if1of ($(KBUILD_TARGET), freebsd linux solaris)
-- # VBOX_PATH_MESA_SOURCE = $(PATH_ROOT)/src/libs/mesa-7.2
--  VBOX_PATH_MESA_SOURCE = $(VBOX_PATH_X11_ROOT)/mesa-7.2
--  VBOX_MESA_INCS = \
-+  ifndef VBOX_USE_SYSTEM_GL_HEADERS
-+   VBOX_GL_INCS = \
- $(VBOX_PATH_MESA_SOURCE) \
- $(VBOX_PATH_MESA_SOURCE)/include \
- $(VBOX_PATH_MESA_SOURCE)/src/mesa/ \
- $(VBOX_PATH_MESA_SOURCE)/src/mesa/glapi \
- $(VBOX_PATH_MESA_SOURCE)/src/mesa/main \
- $(VBOX_PATH_MESA_SOURCE)/src/mesa/drivers/dri/common
-+  endif
-  endif
- 
-  VBOX_DARWIN_OPENGL_INST = obj/VBoxOGL/GL/
-diff --git a/src/VBox/Additions/x11/Makefile.kmk 
b/src/VBox/Additions/x11/Makefile.kmk
-index 75197f9..5d2167e 100644
 a/src/VBox/Additions/x11/Makefile.kmk
-+++ b/src/VBox/Additions/x11/Makefile.kmk
-@@ -20,12 +20,18 @@ include $(KBUILD_PATH)/subheader.kmk
- # Include sub-makefiles.
- if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
-  include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
-- include $(PATH_SUB_CURRENT)/vboxvideo/Makefile.kmk
-- ifneq ($(KBUILD_TARGET), solaris)
--  include $(PATH_SUB_CURRENT)/vboxmouse/Makefile.kmk
-- endif
-- ifndef VBOX_USE_SYSTEM_XORG_HEADERS
--  include $(PATH_SUB_CURRENT)/x11stubs/Makefile.kmk
-+ ifndef VBOX_NO_LEGACY_XORG_X11
-+  include $(PATH_SUB_CURRENT)/vboxvideo/Makefile.kmk
-+  ifneq ($(KBUILD_TARGET), solaris)
-+   include $(PATH_SUB_CURRENT)/vboxmouse/Makefile.kmk
-+  endif
-+  # This should logically only be controlled by VBOX_NO_LEGACY_XORG_X11,
-+  # as it is not used for drivers at all, but rather to build X11 clients
-+  # on systems missing needed libraries.
-+  ## @todo fix at some later point when it will not break people's workflows.
-+  ifndef VBOX_USE_SYSTEM_XORG_HEADERS
-+   include $(PATH_SUB_CURRENT)/x11stubs/Makefile.kmk
-+  endif
-  endif
- endif
- 

Deleted: 009-linux-4-9.patch
===
--- 009-linux-4-9.patch 2016-11-21 22:14:38 UTC (rev 196482)
+++ 009-linux-4-9.patch 2016-11-21 22:29:34 UTC (rev 196483)
@@ -1,37 +0,0 @@
-diff --git a/src/VBox/HostDrivers/Support/SUPDrvInternal.h 
b/src/VBox/HostDrivers/Support/SUPDrvInternal.h
-index aadaa71..d45cdef 100644
 a/src/VBox/HostDrivers/Support/SUPDrvInternal.h
-+++ b/src/VBox/HostDrivers/Support/SUPDrvInternal.h
-@@ -65,7 +65,7 @@
- #   include 
- #   endif
- #   endif
--#   if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 0)
-+#   if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 0) && LINUX_VERSION_CODE < 
KERNEL_VERSION(4, 9, 0)
- #   undef ALIGN
- #   endif
- #   ifndef KBUILD_STR
-diff --git a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c 
b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-index 4cf93c6..c7f932f 100644
 a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-+++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c
-@@ -1050,7 +1050,9 @@ DECLHIDDEN(int) 
rtR0MemObjNativeLockUser(PPRTR0MEMOBJINTERNAL ppMem, RTR3PTR R3P
- rc = get_user_pages(R3Ptr,  /* Where from. */
- cPages, /* How many pages. */
- fWrite, /* Write to memory. */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
- fWrite, /* force write 
access. */
-+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0) */
- >apPages[0],   /* Page array. */
- papVMAs);   /* vmas */
- /*
-@@ -1064,7 +1066,9 @@ DECLHIDDEN(int) 
rtR0MemObjNativeLockUser(PPRTR0MEMOBJINTERNAL ppMem, RTR3PTR R3P
- R3Ptr,  /* Where from. */
- cPages, /* How many pages. */
- fWrite, /* Write to memory. */
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)
- fWrite, /* force

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

2016-08-19 Thread Christian Hesse 
Date: Friday, August 19, 2016 @ 13:56:20
  Author: eworm
Revision: 187063

prepare for version 5.1.4

Modified:
  virtualbox/trunk/005-gsoap-build.patch
  virtualbox/trunk/PKGBUILD
Deleted:
  virtualbox/trunk/008-vbox-guest-linux-4-7.patch

+
 005-gsoap-build.patch  |   12 ++--
 008-vbox-guest-linux-4-7.patch |   15 ---
 PKGBUILD   |   11 +--
 3 files changed, 11 insertions(+), 27 deletions(-)

Modified: 005-gsoap-build.patch
===
--- 005-gsoap-build.patch   2016-08-19 13:53:10 UTC (rev 187062)
+++ 005-gsoap-build.patch   2016-08-19 13:56:20 UTC (rev 187063)
@@ -1,11 +1,11 @@
 --- a/src/VBox/Main/webservice/Makefile.kmk2013-11-21 19:00:46.812761628 
+0100
-+++ b/src/VBox/Main/webservice/Makefile.kmk2014-01-04 04:37:05.803599026 
+0100
-@@ -683,7 +683,7 @@
- : $(VBOXWEB_GSOAPH_FROM_GSOAP) $(VBOXWEB_GSOAPH_FROM_XSLT) $(VBOX_NSMAP) 
$(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
 b/src/VBox/Main/webservice/Makefile.kmk2016-08-18 15:16:05.803599026 
+0100
+@@ -724,7 +724,7 @@ $(VBOXWEB_OUT_DIR)/gsoap_generate_all_ts \
+   $(RECOMPILE_ON_MAKEFILE_CURRENT) | $$(dir $$@)
$(call MSG_GENERATE,,lots of files,$(GSOAPH_RELEVANT))
$(RM) -f $@
 -  $(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) 
$(VBOXWEB_SOAPCPP2_SKIP_FILES) -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) 
$(GSOAPH_RELEVANT)
 +  $(REDIRECT) -C $(VBOXWEB_OUT_DIR) -- $(VBOX_SOAPCPP2) 
$(VBOXWEB_SOAPCPP2_SKIP_FILES) -z1 -L -2 -w -I$(VBOX_PATH_GSOAP_IMPORT) 
$(GSOAPH_RELEVANT)
-   $(APPEND) $@ done
- 
- # copy the generated headers and stuff. This has to be a separate rule if we
+ ifeq ($(KBUILD_TARGET),win) # MSC -Wall workaround.
+   $(CP) -f "$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp"
+   $(SED) -f $(VBOX_PATH_WEBSERVICE)/stdsoap2.sed --output 
"$(VBOXWEB_SOAP_CLIENT_H)" "$(VBOXWEB_SOAP_CLIENT_H).tmp"

Deleted: 008-vbox-guest-linux-4-7.patch
===
--- 008-vbox-guest-linux-4-7.patch  2016-08-19 13:53:10 UTC (rev 187062)
+++ 008-vbox-guest-linux-4-7.patch  2016-08-19 13:56:20 UTC (rev 187063)
@@ -1,15 +0,0 @@
-diff --git a/src/VBox/Additions/linux/drm/vbox_ttm.c 
b/src/VBox/Additions/linux/drm/vbox_ttm.c
-index bcce2d2..40e09d7 100644
 a/src/VBox/Additions/linux/drm/vbox_ttm.c
-+++ b/src/VBox/Additions/linux/drm/vbox_ttm.c
-@@ -274,6 +274,10 @@ struct ttm_bo_driver vbox_bo_driver = {
- .verify_access = vbox_bo_verify_access,
- .io_mem_reserve = _ttm_io_mem_reserve,
- .io_mem_free = _ttm_io_mem_free,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0)
-+.lru_tail = _bo_default_lru_tail,
-+.swap_lru_tail = _bo_default_swap_lru_tail,
-+#endif
- };
- 
- int vbox_mm_init(struct vbox_private *vbox)

Modified: PKGBUILD
===
--- PKGBUILD2016-08-19 13:53:10 UTC (rev 187062)
+++ PKGBUILD2016-08-19 13:56:20 UTC (rev 187063)
@@ -10,8 +10,8 @@
  'virtualbox-guest-utils'
  'virtualbox-guest-utils-nox'
  'virtualbox-ext-vnc')
-pkgver=5.1.2
-pkgrel=3
+pkgver=5.1.4
+pkgrel=0
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -69,9 +69,8 @@
 '005-gsoap-build.patch'
 '006-rdesktop-vrdp-keymap-path.patch'
 '007-python2-path.patch'
-'008-vbox-guest-linux-4-7.patch'
 )
-md5sums=('aff1647170dd92914cddfbd0254b9773'
+md5sums=('e25a6a1f3c113c373dc0433f9c2526f3'
  'a19774e8c56f2c4d12c528992525c444'
  '331f69783ea9d4e762f7103954c500a3'
  '984412a63aa9c07ddc3cfd970381d5df'
@@ -85,10 +84,10 @@
  '0bab94ff2f4835fd907f89eb23ebbe21'
  '9be7e2703afeee1fca9368bd8750e710'
  '9e49bbaa2192b141c27ee43cef8cbab7'
- 'ecfd13297d7753ebe7b8763ca5b792d9'
+ 'e8a0b47e61ddcffdeed71086585a1ef3'
  'd82a6f19be739341ed7f1cf4ee8070ca'
  '188ea65918309f737ce28216c2b07c3b'
- '2b0460e9378f45cc40b3cae14d64439e')
+ )
 
 prepare() {
 cd "VirtualBox-$pkgver"

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

2015-10-07 Thread Sébastien Luttringer 
Date: Thursday, October 8, 2015 @ 01:47:29
  Author: seblu
Revision: 143321

upgpkg: virtualbox 5.0.6-1

Modified:
  virtualbox/trunk/PKGBUILD
Deleted:
  virtualbox/trunk/001-vboxdrv-reference.patch
  virtualbox/trunk/011-fix-i686-build.patch

-+
 001-vboxdrv-reference.patch |   57 --
 011-fix-i686-build.patch|   28 
 PKGBUILD|   13 +++--
 3 files changed, 5 insertions(+), 93 deletions(-)

Deleted: 001-vboxdrv-reference.patch
===
--- 001-vboxdrv-reference.patch 2015-10-07 22:50:31 UTC (rev 143320)
+++ 001-vboxdrv-reference.patch 2015-10-07 23:47:29 UTC (rev 143321)
@@ -1,57 +0,0 @@
-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 +
-+++ VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
2011-11-04 17:48:58.915541368 +
-@@ -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"
--  "  '/etc/init.d/vboxdrv setup'"
--  "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."
-+  "  'pacman -S virtualbox-host-modules'"
-+  "as root. If you don't use our stock kernel, install virtualbox-host-dkms 
and "
-+  "execute dkms autoinstall ."
-   );
- 
- 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"
--  "  '/etc/init.d/vboxdrv setup'"
--  "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 "
-+  "  'dkms autoinstall'"
-   );
- 
- 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 +
-+++ VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh  2011-11-04 
17:56:50.735874087 +
-@@ -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 reinstall the kernel module virtualbox-host-modules or
-+ if you don't use our stock kernel compile the modules with
- 
--   sudo /etc/init.d/vboxdrv setup
-+   sudo dkms autoinstall
- 
-  You will not be able to start VMs until this problem is fixed.
- EOF
- 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 to load the 
module
- 
--   sudo /etc/init.d/vboxdrv restart
-+   sudo modprobe vboxdrv
- 
-  and if that is not successful, try to re-install the package.
- 

Deleted: 011-fix-i686-build.patch
===
--- 011-fix-i686-build.patch2015-10-07 22:50:31 UTC (rev 143320)
+++ 011-fix-i686-build.patch2015-10-07 23:47:29 UTC (rev 143321)
@@ -1,28 +0,0 @@
-Index: src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
-===
 a/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
(revision 57689)
-+++ b/src/VBox/Additions/linux/lightdm-greeter/vbox-greeter.cpp
(revision 57690)
-@@ -842,7 +842,7 @@
-  * @param   enmPhase
-  * @param   pfnLog
-  */
--static void vboxGreeterLogHeaderFooter(PRTLOGGER pLoggerRelease, RTLOGPHASE 
enmPhase, PFNRTLOGPHASEMSG pfnLog)
-+static DECLCALLBACK(void) vboxGreeterLogHeaderFooter(PRTLOGGER 
pLoggerRelease, RTLOGPHASE enmPhase, PFNRTLOGPHASEMSG pfnLog)
- {
- /* Some introductory information. */
- static RTTIMESPEC s_TimeSpec;
-Index: src/VBox/ExtPacks/VNC/VBoxVNC.cpp
-===
 a/src/VBox/ExtPacks/VNC/VBoxVNC.cpp(revision 57657)
-+++ b/src/VBox/ExtPacks/VNC/VBoxVNC.cpp(revision 57658)
-@@ -103,8 +103,8 @@
- unsigned char *mScreenBuffer;
- unsigned char *mFrameBuffer;
- uint32_t

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

2014-12-13 Thread Sébastien Luttringer 
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
===
--- PKGBUILD2014-12-14 01:30:18 UTC (rev 123863)
+++ PKGBUILD2014-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

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

2013-09-06 Thread Sébastien Luttringer 
Date: Saturday, September 7, 2013 @ 00:00:04
  Author: seblu
Revision: 96859

upgpkg: virtualbox 4.2.18-1

Modified:
  virtualbox/trunk/LocalConfig.kmk
  virtualbox/trunk/PKGBUILD
Deleted:
  virtualbox/trunk/005-linux-3.11.patch

--+
 005-linux-3.11.patch |   71 --
 LocalConfig.kmk  |2 -
 PKGBUILD |   75 +
 3 files changed, 46 insertions(+), 102 deletions(-)

Deleted: 005-linux-3.11.patch
===
--- 005-linux-3.11.patch2013-09-06 21:25:20 UTC (rev 96858)
+++ 005-linux-3.11.patch2013-09-06 22:00:04 UTC (rev 96859)
@@ -1,71 +0,0 @@
-diff -Nur 
VirtualBox-4.2.16.orig/src/VBox/Additions/linux/sharedfolders/dirops.c 
VirtualBox-4.2.16/src/VBox/Additions/linux/sharedfolders/dirops.c
 VirtualBox-4.2.16.orig/src/VBox/Additions/linux/sharedfolders/dirops.c 
2013-07-04 13:59:34.0 +
-+++ VirtualBox-4.2.16/src/VBox/Additions/linux/sharedfolders/dirops.c  
2013-09-03 13:21:25.314389481 +
-@@ -233,7 +233,11 @@
-  * b. failure to compute fake inode number
-  * c. filldir returns an error (see comment on that)
-  */
-+#if LINUX_VERSION_CODE = KERNEL_VERSION(3, 11, 0)
-+static int sf_dir_iterate(struct file *dir, struct dir_context *ctx)
-+#else 
- static int sf_dir_read (struct file *dir, void *opaque, filldir_t filldir)
-+#endif 
- {
- TRACE();
- for (;;)
-@@ -257,12 +261,18 @@
- /* skip erroneous entry and proceed */
- LogFunc((sf_getdent error %d\n, err));
- dir-f_pos += 1;
-+#if LINUX_VERSION_CODE = KERNEL_VERSION(3, 11, 0) 
-+ctx-pos += 1; 
-+#endif 
- continue;
- }
- 
- /* d_name now contains a valid entry name */
--
-+#if LINUX_VERSION_CODE = KERNEL_VERSION(3, 11, 0) 
-+  sanity = ctx-pos + 0xbeef;
-+#else 
- sanity = dir-f_pos + 0xbeef;
-+#endif 
- fake_ino = sanity;
- if (sanity - fake_ino)
- {
-@@ -270,8 +280,12 @@
- return -EINVAL;
- }
- 
-+#if LINUX_VERSION_CODE = KERNEL_VERSION(3, 11, 0) 
-+err = dir_emit(ctx, d_name, strlen(d_name), fake_ino, DT_UNKNOWN); 
-+#else 
- err = filldir(opaque, d_name, strlen(d_name),
-   dir-f_pos, fake_ino, DT_UNKNOWN);
-+#endif 
- if (err)
- {
- LogFunc((filldir returned error %d\n, err));
-@@ -289,7 +303,11 @@
- struct file_operations sf_dir_fops =
- {
- .open= sf_dir_open,
-+#if LINUX_VERSION_CODE = KERNEL_VERSION(3, 11, 0) 
-+ .iterate = sf_dir_iterate,
-+#else 
- .readdir = sf_dir_read,
-+#endif 
- .release = sf_dir_release,
- .read= generic_read_dir
- #if LINUX_VERSION_CODE = KERNEL_VERSION(2, 6, 37)
 a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
-+++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
-@@ -1805,5 +1805,9 @@
- {
- PVBOXNETFLTINS  pThis = VBOX_FLT_NB_TO_INST(self);
-+#if LINUX_VERSION_CODE = KERNEL_VERSION(3, 11, 0)
-+struct net_device  *pDev  = netdev_notifier_info_to_dev(ptr);
-+#else
- struct net_device  *pDev  = (struct net_device *)ptr;
-+#endif
- int rc= NOTIFY_OK;

Modified: LocalConfig.kmk
===
--- LocalConfig.kmk 2013-09-06 21:25:20 UTC (rev 96858)
+++ LocalConfig.kmk 2013-09-06 22:00:04 UTC (rev 96859)
@@ -18,5 +18,5 @@
 VBOX_JAVA_HOME = /usr/lib/jvm/java-7-openjdk
 VBOX_GCC_WERR =
 VBOX_GCC_WARN =
-VBOX_GSOAP_CXX_LIBS := gsoapssl++ z
+#VBOX_GSOAP_CXX_LIBS := gsoapssl++ z
 #INST_EXTPACK = /var/lib/virtualbox/extensionpacks/

Modified: PKGBUILD
===
--- PKGBUILD2013-09-06 21:25:20 UTC (rev 96858)
+++ PKGBUILD2013-09-06 22:00:04 UTC (rev 96859)
@@ -9,8 +9,8 @@
  'virtualbox-sdk'
  'virtualbox-guest-utils'
  'virtualbox-ext-vnc')
-pkgver=4.2.16
-pkgrel=3
+pkgver=4.2.18
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -55,18 +55,16 @@
 'vboxweb.service'
 '001-vboxdrv-reference.patch'
 '002-change_default_driver_dir.patch'
-'004-system-xorg.patch'
-'005-linux-3.11.patch')
-md5sums=('c4a36e2099a317f4715cd3861cdae238'
+'004-system-xorg.patch')
+md5sums=('99cdf054b5e36aa83b60bd49fb50f943'
  '5f85710e0b8606de967716ded7b2d351'
  'ed1341881437455d9735875ddf455fbe'
- 'b87d721ce403b0191245fe844f5d9f7c'
+ '43862d1e25a5c63b5c195b806759c7cf'
  '07c5f6d86c4b7839d719c8ee0c53653b'
  'bc9efed88e0469cd7fc460d5a5cd7b4b'
  '6dbd16b9d1530fc42ff6904cd80be91d'
  '97e193f050574dd272a38e5ee5ebe62b'
- '4da461f8c90caa123b47c62479f426b4'
- '647ce4b328004497a9f4e81010fb3884')
+

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

2013-09-05 Thread Maxime Gauduin 
Date: Thursday, September 5, 2013 @ 20:35:00
  Author: alucryd
Revision: 96803

linux 3.11 fix: virtualbox 4.2.16-3

Modified:
  virtualbox/trunk/005-linux-3.11.patch
  virtualbox/trunk/LocalConfig.kmk
  virtualbox/trunk/PKGBUILD

--+
 005-linux-3.11.patch |   11 +++
 LocalConfig.kmk  |1 +
 PKGBUILD |6 +++---
 3 files changed, 15 insertions(+), 3 deletions(-)

Modified: 005-linux-3.11.patch
===
--- 005-linux-3.11.patch2013-09-05 18:01:44 UTC (rev 96802)
+++ 005-linux-3.11.patch2013-09-05 18:35:00 UTC (rev 96803)
@@ -58,3 +58,14 @@
  .release = sf_dir_release,
  .read= generic_read_dir
  #if LINUX_VERSION_CODE = KERNEL_VERSION(2, 6, 37)
+--- a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
 b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c
+@@ -1805,5 +1805,9 @@
+ {
+ PVBOXNETFLTINS  pThis = VBOX_FLT_NB_TO_INST(self);
++#if LINUX_VERSION_CODE = KERNEL_VERSION(3, 11, 0)
++struct net_device  *pDev  = netdev_notifier_info_to_dev(ptr);
++#else
+ struct net_device  *pDev  = (struct net_device *)ptr;
++#endif
+ int rc= NOTIFY_OK;

Modified: LocalConfig.kmk
===
--- LocalConfig.kmk 2013-09-05 18:01:44 UTC (rev 96802)
+++ LocalConfig.kmk 2013-09-05 18:35:00 UTC (rev 96803)
@@ -18,4 +18,5 @@
 VBOX_JAVA_HOME = /usr/lib/jvm/java-7-openjdk
 VBOX_GCC_WERR =
 VBOX_GCC_WARN =
+VBOX_GSOAP_CXX_LIBS := gsoapssl++ z
 #INST_EXTPACK = /var/lib/virtualbox/extensionpacks/

Modified: PKGBUILD
===
--- PKGBUILD2013-09-05 18:01:44 UTC (rev 96802)
+++ PKGBUILD2013-09-05 18:35:00 UTC (rev 96803)
@@ -10,7 +10,7 @@
  'virtualbox-guest-utils'
  'virtualbox-ext-vnc')
 pkgver=4.2.16
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -60,13 +60,13 @@
 md5sums=('c4a36e2099a317f4715cd3861cdae238'
  '5f85710e0b8606de967716ded7b2d351'
  'ed1341881437455d9735875ddf455fbe'
- '16f1c7e829d5d4a306b924bd9ffb2984'
+ 'b87d721ce403b0191245fe844f5d9f7c'
  '07c5f6d86c4b7839d719c8ee0c53653b'
  'bc9efed88e0469cd7fc460d5a5cd7b4b'
  '6dbd16b9d1530fc42ff6904cd80be91d'
  '97e193f050574dd272a38e5ee5ebe62b'
  '4da461f8c90caa123b47c62479f426b4'
- 'b3ed99c214dd6d02e88c855914353e64')
+ '647ce4b328004497a9f4e81010fb3884')
 
 prepare() {
 cd VirtualBox-$pkgver

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

2013-09-04 Thread Sébastien Luttringer 
Date: Wednesday, September 4, 2013 @ 21:51:32
  Author: seblu
Revision: 96769

Honor patch naming scheme

Added:
  virtualbox/trunk/005-linux-3.11.patch
(from rev 96768, virtualbox/trunk/linux-3.11.patch)
Modified:
  virtualbox/trunk/PKGBUILD
Deleted:
  virtualbox/trunk/linux-3.11.patch

--+
 005-linux-3.11.patch |   60 +
 PKGBUILD |2 -
 linux-3.11.patch |   60 -
 3 files changed, 61 insertions(+), 61 deletions(-)

Copied: virtualbox/trunk/005-linux-3.11.patch (from rev 96768, 
virtualbox/trunk/linux-3.11.patch)
===
--- 005-linux-3.11.patch(rev 0)
+++ 005-linux-3.11.patch2013-09-04 19:51:32 UTC (rev 96769)
@@ -0,0 +1,60 @@
+diff -Nur 
VirtualBox-4.2.16.orig/src/VBox/Additions/linux/sharedfolders/dirops.c 
VirtualBox-4.2.16/src/VBox/Additions/linux/sharedfolders/dirops.c
+--- VirtualBox-4.2.16.orig/src/VBox/Additions/linux/sharedfolders/dirops.c 
2013-07-04 13:59:34.0 +
 VirtualBox-4.2.16/src/VBox/Additions/linux/sharedfolders/dirops.c  
2013-09-03 13:21:25.314389481 +
+@@ -233,7 +233,11 @@
+  * b. failure to compute fake inode number
+  * c. filldir returns an error (see comment on that)
+  */
++#if LINUX_VERSION_CODE = KERNEL_VERSION(3, 11, 0)
++static int sf_dir_iterate(struct file *dir, struct dir_context *ctx)
++#else 
+ static int sf_dir_read (struct file *dir, void *opaque, filldir_t filldir)
++#endif 
+ {
+ TRACE();
+ for (;;)
+@@ -257,12 +261,18 @@
+ /* skip erroneous entry and proceed */
+ LogFunc((sf_getdent error %d\n, err));
+ dir-f_pos += 1;
++#if LINUX_VERSION_CODE = KERNEL_VERSION(3, 11, 0) 
++ctx-pos += 1; 
++#endif 
+ continue;
+ }
+ 
+ /* d_name now contains a valid entry name */
+-
++#if LINUX_VERSION_CODE = KERNEL_VERSION(3, 11, 0) 
++  sanity = ctx-pos + 0xbeef;
++#else 
+ sanity = dir-f_pos + 0xbeef;
++#endif 
+ fake_ino = sanity;
+ if (sanity - fake_ino)
+ {
+@@ -270,8 +280,12 @@
+ return -EINVAL;
+ }
+ 
++#if LINUX_VERSION_CODE = KERNEL_VERSION(3, 11, 0) 
++err = dir_emit(ctx, d_name, strlen(d_name), fake_ino, DT_UNKNOWN); 
++#else 
+ err = filldir(opaque, d_name, strlen(d_name),
+   dir-f_pos, fake_ino, DT_UNKNOWN);
++#endif 
+ if (err)
+ {
+ LogFunc((filldir returned error %d\n, err));
+@@ -289,7 +303,11 @@
+ struct file_operations sf_dir_fops =
+ {
+ .open= sf_dir_open,
++#if LINUX_VERSION_CODE = KERNEL_VERSION(3, 11, 0) 
++ .iterate = sf_dir_iterate,
++#else 
+ .readdir = sf_dir_read,
++#endif 
+ .release = sf_dir_release,
+ .read= generic_read_dir
+ #if LINUX_VERSION_CODE = KERNEL_VERSION(2, 6, 37)

Modified: PKGBUILD
===
--- PKGBUILD2013-09-04 17:05:07 UTC (rev 96768)
+++ PKGBUILD2013-09-04 19:51:32 UTC (rev 96769)
@@ -56,7 +56,7 @@
 '001-vboxdrv-reference.patch'
 '002-change_default_driver_dir.patch'
 '004-system-xorg.patch'
-'linux-3.11.patch')
+'005-linux-3.11.patch')
 md5sums=('c4a36e2099a317f4715cd3861cdae238'
  '5f85710e0b8606de967716ded7b2d351'
  'ed1341881437455d9735875ddf455fbe'

Deleted: linux-3.11.patch
===
--- linux-3.11.patch2013-09-04 17:05:07 UTC (rev 96768)
+++ linux-3.11.patch2013-09-04 19:51:32 UTC (rev 96769)
@@ -1,60 +0,0 @@
-diff -Nur 
VirtualBox-4.2.16.orig/src/VBox/Additions/linux/sharedfolders/dirops.c 
VirtualBox-4.2.16/src/VBox/Additions/linux/sharedfolders/dirops.c
 VirtualBox-4.2.16.orig/src/VBox/Additions/linux/sharedfolders/dirops.c 
2013-07-04 13:59:34.0 +
-+++ VirtualBox-4.2.16/src/VBox/Additions/linux/sharedfolders/dirops.c  
2013-09-03 13:21:25.314389481 +
-@@ -233,7 +233,11 @@
-  * b. failure to compute fake inode number
-  * c. filldir returns an error (see comment on that)
-  */
-+#if LINUX_VERSION_CODE = KERNEL_VERSION(3, 11, 0)
-+static int sf_dir_iterate(struct file *dir, struct dir_context *ctx)
-+#else 
- static int sf_dir_read (struct file *dir, void *opaque, filldir_t filldir)
-+#endif 
- {
- TRACE();
- for (;;)
-@@ -257,12 +261,18 @@
- /* skip erroneous entry and proceed */
- LogFunc((sf_getdent error %d\n, err));
- dir-f_pos += 1;
-+#if LINUX_VERSION_CODE = KERNEL_VERSION(3, 11, 0) 
-+ctx-pos += 1; 
-+#endif 
- continue;
- }
- 
- /* d_name now contains a valid entry name */
--
-+#if LINUX_VERSION_CODE = KERNEL_VERSION(3, 11, 0) 
-+  sanity = ctx-pos + 0xbeef;
-+#else 
- sanity =

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

2013-02-21 Thread Sébastien Luttringer 
Date: Thursday, February 21, 2013 @ 20:29:21
  Author: seblu
Revision: 84679

upgpkg: virtualbox 4.2.6-4

- rebuild with qt4

Added:
  virtualbox/trunk/003-linux-3.8.patch
Modified:
  virtualbox/trunk/PKGBUILD
Deleted:
  virtualbox/trunk/linux-3.8.patch

-+
 003-linux-3.8.patch |   15 +++
 PKGBUILD|   10 +-
 linux-3.8.patch |   17 -
 3 files changed, 20 insertions(+), 22 deletions(-)

Added: 003-linux-3.8.patch
===
--- 003-linux-3.8.patch (rev 0)
+++ 003-linux-3.8.patch 2013-02-21 19:29:21 UTC (rev 84679)
@@ -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,

Modified: PKGBUILD
===
--- PKGBUILD2013-02-21 18:18:39 UTC (rev 84678)
+++ PKGBUILD2013-02-21 19:29:21 UTC (rev 84679)
@@ -10,7 +10,7 @@
  'virtualbox-guest-utils'
  'virtualbox-ext-vnc')
 pkgver=4.2.6
-pkgrel=3
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL' 'custom')
@@ -37,7 +37,7 @@
  'mesa'
  'glu'
  'python2'
- 'qt'
+ 'qt4'
  'sdl'
  'sdl_ttf'
  'vde2'
@@ -52,7 +52,7 @@
 'vboxweb.service'
 '001-vboxdrv-reference.patch'
 '002-change_default_driver_dir.patch'
-'linux-3.8.patch')
+'003-linux-3.8.patch')
 md5sums=('d680aeb3b4379b8281527aeb012b2df5'
  '5cdffabb7ffacfd49dcc93d747ede762'
  '5f85710e0b8606de967716ded7b2d351'
@@ -62,7 +62,7 @@
  'bc9efed88e0469cd7fc460d5a5cd7b4b'
  '6dbd16b9d1530fc42ff6904cd80be91d'
  '97e193f050574dd272a38e5ee5ebe62b'
- 'de327c6c5cec4e5414af75585c2600af')
+ 'e565ff0d028776d4f48e6e5b4d0b48e0')
 
 build() {
 cd VirtualBox-$pkgver
@@ -116,7 +116,7 @@
  'sdl'
  'shared-mime-info'
  'virtualbox-host-modules')
-optdepends=('qt: VirtualBox GUI support'
+optdepends=('qt4: VirtualBox GUI support'
 'vde2: Virtual Distributed Ethernet support'
 'virtualbox-sdk: Developer kit'
 'virtualbox-host-dkms: Host kernel source modules for 
non-stock kernels'

Deleted: linux-3.8.patch
===
--- linux-3.8.patch 2013-02-21 18:18:39 UTC (rev 84678)
+++ linux-3.8.patch 2013-02-21 19:29:21 UTC (rev 84679)
@@ -1,17 +0,0 @@
-Index: src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c
-===
 a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c(revision 44316)
-+++ 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,