API tools faq
paste
Advertisement
Guest User

virtualbox-5.0.0_BETA2.patch

a guest
Apr 30th, 2015
391
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 6.91 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/006-rdesktop-vrdp-keymap-path.patch b/006-rdesktop-vrdp-keymap-path.patch
  2. index 4eb9d83..651bb84 100644
  3. --- a/006-rdesktop-vrdp-keymap-path.patch
  4. +++ b/006-rdesktop-vrdp-keymap-path.patch
  5. @@ -1,12 +1,12 @@
  6. # 2013 © Sébastien Luttringer
  7. ---- a/src/VBox/RDP/client/Makefile.kmk 2013-02-19 23:12:20.207464901 +0100
  8. -+++ b/src/VBox/RDP/client/Makefile.kmk 2014-01-04 04:17:26.700618600 +0100
  9. +--- a/src/VBox/RDP/client-1.8.3/Makefile.kmk 2013-02-19 23:12:20.207464901 +0100
  10. ++++ b/src/VBox/RDP/client-1.8.3/Makefile.kmk 2014-01-04 04:17:26.700618600 +0100
  11. @@ -41,7 +41,7 @@
  12. EGD_SOCKET=\"/var/run/egd-pool\" WITH_RDPSND=1 HAVE_DIRENT_H=1 \
  13. HAVE_ICONV=1 HAVE_SYS_STATVFS_H=1 \
  14. HAVE_SYS_PARAM_H=1 HAVE_SYS_MOUNT_H=1 HAVE_STRUCT_STATVFS_F_NAMEMAX=1 \
  15. -- KEYMAP_PATH=$(if $(findstring RTPATH_APP_PRIVATE,$(DEFS)),RTPATH_APP_PRIVATE,\"/opt/VirtualBox\")\"/rdesktop-vrdp-keymaps\" \
  16. -+ KEYMAP_PATH=$(if $(findstring RTPATH_APP_PRIVATE,$(DEFS)),RTPATH_APP_PRIVATE,\"/usr/share/virtualbox\")\"/rdesktop-vrdp-keymaps\" \
  17. +- KEYMAP_PATH=$(if $(findstring RTPATH_APP_PRIVATE,$(CDEFS)),RTPATH_APP_PRIVATE,\"/opt/VirtualBox\")\"/rdesktop-vrdp-keymaps\" \
  18. ++ KEYMAP_PATH=$(if $(findstring RTPATH_APP_PRIVATE,$(CDEFS)),RTPATH_APP_PRIVATE,\"/usr/share/virtualbox\")\"/rdesktop-vrdp-keymaps\" \
  19. RDESKTOP=1
  20. ifdef WITH_BIRD_VD_HACKS
  21. rdesktop-vrdp_DEFS += WITH_BIRD_VD_HACKS
  22. diff --git a/009-fix-smap-crash.patch b/009-fix-smap-crash.patch
  23. deleted file mode 100644
  24. index ba60657..0000000
  25. --- a/009-fix-smap-crash.patch
  26. +++ /dev/null
  27. @@ -1,107 +0,0 @@
  28. -# https://www.virtualbox.org/ticket/13961
  29. -
  30. ---- a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c 2015-03-20 15:24:13.000000000 +0100
  31. -+++ b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c 2015-03-20 15:23:51.000000000 +0100
  32. -@@ -48,12 +48,6 @@
  33. - # include <iprt/power.h>
  34. - # define VBOX_WITH_SUSPEND_NOTIFICATION
  35. - #endif
  36. --#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0)
  37. --# include <asm/smap.h>
  38. --#else
  39. --static inline void clac(void) { }
  40. --static inline void stac(void) { }
  41. --#endif
  42. -
  43. - #include <linux/sched.h>
  44. - #ifdef CONFIG_DEVFS_FS
  45. ---- a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h 2015-03-20 15:24:13.000000000 +0100
  46. -+++ b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h 2015-03-20 15:23:52.000000000 +0100
  47. -@@ -145,6 +145,13 @@
  48. - # include <asm/tlbflush.h>
  49. - #endif
  50. -
  51. -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 7, 0)
  52. -+# include <asm/smap.h>
  53. -+#else
  54. -+static inline void clac(void) { }
  55. -+static inline void stac(void) { }
  56. -+#endif
  57. -+
  58. - #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0)
  59. - # ifndef page_to_pfn
  60. - # define page_to_pfn(page) ((page) - mem_map)
  61. ---- a/src/VBox/Runtime/r0drv/linux/threadctxhooks-r0drv-linux.c 2015-03-20 15:24:13.000000000 +0100
  62. -+++ b/src/VBox/Runtime/r0drv/linux/threadctxhooks-r0drv-linux.c 2015-03-20 15:23:52.000000000 +0100
  63. -@@ -36,6 +36,9 @@
  64. - #include <iprt/thread.h>
  65. - #include <iprt/err.h>
  66. - #include <iprt/asm.h>
  67. -+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
  68. -+# include <iprt/asm-amd64-x86.h>
  69. -+#endif
  70. - #include "internal/thread.h"
  71. -
  72. - /*
  73. -@@ -68,6 +71,11 @@
  74. - struct preempt_ops hPreemptOps;
  75. - /** The reference count for this object. */
  76. - uint32_t volatile cRefs;
  77. -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 19) && defined(RT_ARCH_AMD64)
  78. -+ /** Starting with 3.1.19, the linux kernel doesn't restore kernel RFLAGS during
  79. -+ * task switch, so we have to do that ourselves. (x86 code is not affected.) */
  80. -+ RTCCUINTREG fSavedRFlags;
  81. -+#endif
  82. - } RTTHREADCTXINT, *PRTTHREADCTXINT;
  83. -
  84. -
  85. -@@ -84,12 +92,24 @@
  86. - static void rtThreadCtxHooksLnxSchedOut(struct preempt_notifier *pPreemptNotifier, struct task_struct *pNext)
  87. - {
  88. - PRTTHREADCTXINT pThis = RT_FROM_MEMBER(pPreemptNotifier, RTTHREADCTXINT, hPreemptNotifier);
  89. -+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
  90. -+ RTCCUINTREG fSavedEFlags = ASMGetFlags();
  91. -+ stac();
  92. -+#endif
  93. -+
  94. - AssertPtr(pThis);
  95. - AssertPtr(pThis->pfnThreadCtxHook);
  96. - Assert(pThis->fRegistered);
  97. - Assert(!RTThreadPreemptIsEnabled(NIL_RTTHREAD));
  98. -
  99. - pThis->pfnThreadCtxHook(RTTHREADCTXEVENT_PREEMPTING, pThis->pvUser);
  100. -+
  101. -+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
  102. -+ ASMSetFlags(fSavedEFlags);
  103. -+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 19) && defined(RT_ARCH_AMD64)
  104. -+ pThis->fSavedRFlags = fSavedEFlags;
  105. -+# endif
  106. -+#endif
  107. - }
  108. -
  109. -
  110. -@@ -105,11 +125,24 @@
  111. - static void rtThreadCtxHooksLnxSchedIn(struct preempt_notifier *pPreemptNotifier, int iCpu)
  112. - {
  113. - PRTTHREADCTXINT pThis = RT_FROM_MEMBER(pPreemptNotifier, RTTHREADCTXINT, hPreemptNotifier);
  114. -+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
  115. -+ RTCCUINTREG fSavedEFlags = ASMGetFlags();
  116. -+ stac();
  117. -+#endif
  118. -+
  119. - AssertPtr(pThis);
  120. - AssertPtr(pThis->pfnThreadCtxHook);
  121. - Assert(pThis->fRegistered);
  122. -
  123. - pThis->pfnThreadCtxHook(RTTHREADCTXEVENT_RESUMED, pThis->pvUser);
  124. -+
  125. -+#if defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)
  126. -+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 19) && defined(RT_ARCH_AMD64)
  127. -+ fSavedEFlags &= ~RT_BIT_64(18) /*X86_EFL_AC*/;
  128. -+ fSavedEFlags |= pThis->fSavedRFlags & RT_BIT_64(18) /*X86_EFL_AC*/;
  129. -+# endif
  130. -+ ASMSetFlags(fSavedEFlags);
  131. -+#endif
  132. - }
  133. -
  134. -
  135. diff --git a/PKGBUILD b/PKGBUILD
  136. index 70fe724..0916046 100644
  137. --- a/PKGBUILD
  138. +++ b/PKGBUILD
  139. @@ -10,8 +10,8 @@ pkgname=('virtualbox'
  140. 'virtualbox-guest-utils'
  141. 'virtualbox-guest-utils-nox'
  142. 'virtualbox-ext-vnc')
  143. -pkgver=4.3.26
  144. -pkgrel=3
  145. +pkgver=5.0.0_BETA2
  146. +pkgrel=1
  147. arch=('i686' 'x86_64')
  148. url='http://virtualbox.org'
  149. license=('GPL' 'custom')
  150. @@ -65,9 +65,8 @@ source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.ta
  151. '005-gsoap-build.patch'
  152. '006-rdesktop-vrdp-keymap-path.patch'
  153. '007-python2-path.patch'
  154. - '008-root-window.patch'
  155. - '009-fix-smap-crash.patch')
  156. -md5sums=('df8fa3b1820773556b33ae0405553120'
  157. + '008-root-window.patch')
  158. +md5sums=('65886c56eb1da48ed172fe1890a7db9e'
  159. '4833c8e0524fd2272b24ba0d94aef006'
  160. '6e2722bfd7013c1b0174382626ac1b8d'
  161. 'ed1341881437455d9735875ddf455fbe'
  162. @@ -81,10 +80,9 @@ md5sums=('df8fa3b1820773556b33ae0405553120'
  163. '1ca474b3c236bd1ffd53ec125cdf3680'
  164. 'a585770c6652f259c50958478b7ee735'
  165. 'ecfd13297d7753ebe7b8763ca5b792d9'
  166. - '7ea75b242e19440d622eb42a4d6c62c4'
  167. + '9c47505c81c3008e00068f6bf0ccdbba'
  168. '188ea65918309f737ce28216c2b07c3b'
  169. - '7495960c8fd0ac5867b6fa9cd87a64bb'
  170. - '1e01ddec15422708a8a795033db20b17')
  171. + '7495960c8fd0ac5867b6fa9cd87a64bb')
  172.  
  173. prepare() {
  174. cd "VirtualBox-$pkgver"
  175. @@ -122,7 +120,7 @@ build() {
  176. kmk
  177.  
  178. msg2 'Build rdesktop-vrdp'
  179. - pushd src/VBox/RDP/client >/dev/null
  180. + pushd src/VBox/RDP/client-1.8.3 >/dev/null
  181. kmk
  182. popd >/dev/null
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!