Merge branch 'master' into docker_1_11_2

hardware/virtualization/virtualbox/actions.py

@@ -15,8 +15,8 @@ VBoxDataDir = "/usr/share/virtualbox"
 KDIR = kerneltools.getKernelVersion()
 
 def setup():
-    #pisitools.dosed("LocalConfig.kmk", "__VBOXLIBDIR__", VBoxLibDir)
-    #pisitools.dosed("LocalConfig.kmk", "__VBOXDATADIR__", VBoxDataDir)
+    pisitools.dosed("LocalConfig.kmk", "__VBOXLIBDIR__", VBoxLibDir)
+    pisitools.dosed("LocalConfig.kmk", "__VBOXDATADIR__", VBoxDataDir)
 
     shelltools.echo("vbox.cfg", "INSTALL_DIR=%s" % VBoxLibDir)
 
@@ -94,7 +94,7 @@ def install():
     pisitools.dolib("additions/VBoxOGL*")
     pisitools.dosym("../../../VBoxOGL.so", "/usr/lib/xorg/modules/dri/vboxvideo_dri.so")
 
-    pisitools.insinto("/usr/lib/xorg/modules/drivers", "additions/vboxvideo_drv_%s.so" % XorgVersion, "vboxvideo_drv.so")
+    pisitools.insinto("/usr/lib/xorg/modules/drivers", "additions/vboxvideo_drv_system.so", "vboxvideo.so")
     #pisitools.insinto("/usr/lib/xorg/modules/input",   "additions/vboxmouse_drv_%s.so" % XorgVersion, "vboxmouse_drv.so")
 
     # Python bindings

hardware/virtualization/virtualbox/comar/package.py

@@ -10,4 +10,5 @@ def postInstall(fromVersion, fromRelease, toVersion, toRelease):
     for _file in files:
         f = "/usr/lib/virtualbox/%s" % _file
         os.system("/bin/chown :%s %s" % (vboxgroup, f))
-        os.chmod(f, 04510)
+        os.chmod(f, 04755)
+

hardware/virtualization/virtualbox/comar/service.py

@@ -0,0 +1,32 @@
+from comar.service import *
+import os
+
+serviceType = "script"
+serviceDefault = "on"
+serviceDesc = _({"en": "VirtualBox",
+                 "tr": "VirtualBox"})
+serviceConf = "virtualbox"
+PIDFILE = "/run/virtualbox.pid"
+
+@synchronized
+def start():
+        os.system("/sbin/modprobe vboxguest")
+        os.system("/sbin/modprobe vboxvideo") 
+        os.system("/sbin/modprobe vboxsf")
+        os.system("/sbin/modprobe vboxdrv")
+        
+
+@synchronized
+def reload():
+    if os.path.exists(PIDFILE):
+        os.kill(int(open(PIDFILE, "r").read().strip()), 1)
+
+@synchronized
+def stop():
+    stopService(pidfile=PIDFILE, donotify=True)
+    if os.path.isfile(PIDFILE): os.unlink(PIDFILE)
+
+def status():
+    return isServiceRunning(pidfile=PIDFILE)
+
+

hardware/virtualization/virtualbox/files/003-ogl-include-path.patch

@@ -1,6 +1,8 @@
---- a/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2013-03-19 18:55:28.774951223 +0000
-+++ b/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2013-03-19 18:58:06.337193736 +0000
-@@ -63,18 +63,12 @@
+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     += \
@@ -24,3 +26,18 @@
   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 += \

hardware/virtualization/virtualbox/files/LocalConfig.kmk

@@ -1,9 +1,9 @@
-VBOX_WITH_ADDITION_DRIVERS =
-VBOX_WITH_INSTALLER = 1
-VBOX_WITH_LINUX_ADDITIONS = 1
-VBOX_WITH_X11_ADDITIONS = 1
-VBOX_WITH_TESTCASES =
-VBOX_WITH_TESTSUITE =
+# do not build test cases
+VBOX_WITH_TESTCASES :=
+VBOX_WITH_TESTSUITE :=
+VBOX_WITH_VALIDATIONKIT :=
+
+# PisiLinux path
 VBOX_WITH_ORIGIN :=
 VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox
 VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
@@ -11,11 +11,18 @@ VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
 VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
 VBOX_PATH_APP_DOCS := /usr/share/doc/virtualbox
 VBOX_PATH_PACKAGE_DOCS := $(VBOX_PATH_APP_DOCS)
-VBOX_WITH_REGISTRATION_REQUEST =
-VBOX_WITH_UPDATE_REQUEST =
 VBOX_BLD_PYTHON = python
 VBOX_JAVA_HOME = /usr/lib/jvm/java-7-openjdk
+
+# do not fail on warning
 VBOX_GCC_WERR =
 VBOX_GCC_WARN =
+
 # fix gsoap missing zlib include and produce errors with --as-needed
 VBOX_GSOAP_CXX_LIBS := gsoapssl++ z
+
+# use system xorg
+VBOX_USE_SYSTEM_XORG_HEADERS = 1
+
+# no update request. update are handled via pisi
+VBOX_WITH_UPDATE_REQUEST := 0

hardware/virtualization/virtualbox/files/LocalConfig2.kmk

@@ -0,0 +1,21 @@
+VBOX_WITH_ADDITION_DRIVERS =
+VBOX_WITH_INSTALLER = 1
+VBOX_WITH_LINUX_ADDITIONS = 1
+VBOX_WITH_X11_ADDITIONS = 1
+VBOX_WITH_TESTCASES =
+VBOX_WITH_TESTSUITE =
+VBOX_WITH_ORIGIN :=
+VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox
+VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
+VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
+VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
+VBOX_PATH_APP_DOCS := /usr/share/doc/virtualbox
+VBOX_PATH_PACKAGE_DOCS := $(VBOX_PATH_APP_DOCS)
+VBOX_WITH_REGISTRATION_REQUEST =
+VBOX_WITH_UPDATE_REQUEST =
+VBOX_BLD_PYTHON = python
+VBOX_JAVA_HOME = /usr/lib/jvm/java-7-openjdk
+VBOX_GCC_WERR =
+VBOX_GCC_WARN =
+# fix gsoap missing zlib include and produce errors with --as-needed
+VBOX_GSOAP_CXX_LIBS := gsoapssl++ z

hardware/virtualization/virtualbox/files/python.patch

@@ -0,0 +1,9 @@
+# 2013 © Sébastien Luttringer
+--- a/src/VBox/Frontends/VBoxShell/vboxshell.py	2014-01-03 01:38:41.831615590 +0100
++++ b/src/VBox/Frontends/VBoxShell/vboxshell.py	2014-01-04 04:23:33.884544420 +0100
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/python
+ # -*- coding: utf-8 -*-
+ # $Id: vboxshell.py 49841 2013-12-09 13:32:33Z vboxsync $
+ """

hardware/virtualization/virtualbox/files/vboxreload

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-# vboxreload: shortcut to reload virtualbox modules with DKMS support
+# vboxreload: shortcut to reload virtualbox host modules
 #
-# Copyright © 2013 Sébastien Luttringer
+# Copyright © 2016 Sébastien Luttringer
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -18,6 +18,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
+(( UID > 0 )) && { echo 'You must be root' >&2; exit 1; }
+
 modules=(vboxnetadp vboxnetflt vboxpci vboxdrv)
 
 echo -n 'Unloading modules: '
@@ -26,11 +28,6 @@ for _m in "${modules[@]}"; do
 done
 echo
 
-if type -P dkms >/dev/null; then
-  echo 'DKMS autoinstall'
-  dkms autoinstall
-fi
-
 echo -n 'Loading modules: '
 for _m in "${modules[@]}"; do
   modprobe "$_m" && echo -n "$_m "

hardware/virtualization/virtualbox/pspec.xml

@@ -12,7 +12,7 @@
         <IsA>app:gui</IsA>
         <Summary>A powerful virtualization program</Summary>
         <Description>VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use. This is the Open Source Edition which lacks USB support and some other things.</Description>
-        <Archive sha1sum="8e7fa9bb7ab16854418c7878b61cc10dc5cc6a77" type="tarbz2">http://download.virtualbox.org/virtualbox/5.1.0_BETA2/VirtualBox-5.1.0_BETA2.tar.bz2</Archive>       
+        <Archive sha1sum="dba4db3933b9fc8d5632a8c86bd6a7747d891ed9" type="tarbz2">http://download.virtualbox.org/virtualbox/5.1.2/VirtualBox-5.1.2.tar.bz2</Archive>       
         <BuildDependencies>
             <Dependency>dev86</Dependency>
             <Dependency>cdrkit</Dependency>
@@ -42,9 +42,10 @@
             <Dependency>libvncserver-devel</Dependency>
             <Dependency>libXcomposite-devel</Dependency>
             <Dependency>pulseaudio-libs-devel</Dependency>
-            <Dependency>jdk7-openjdk</Dependency>
             <Dependency>kernel-module-headers</Dependency>
             <Dependency>qt5-x11extras-devel</Dependency>
+            <Dependency>jdk7-openjdk</Dependency>
+            <Dependency>jre7-openjdk</Dependency>
             <Dependency>libxcb-devel</Dependency>
             <Dependency>qt5-base-devel</Dependency>
             <Dependency>qt5-linguist</Dependency>
@@ -58,6 +59,7 @@
             <Patch level="1">003-ogl-include-path.patch</Patch>
             <Patch level="1">008-root-window.patch</Patch>
             <Patch level="1">004-xorg.patch</Patch>
+            <Patch level="1">python.patch</Patch>
         </Patches>
     </Source>
 
@@ -102,6 +104,7 @@
         </Files>
         <Provides>
             <COMAR script="package.py">System.Package</COMAR>
+            <COMAR script="service.py">System.Service</COMAR>
         </Provides>
         <AdditionalFiles>
             <AdditionalFile owner="root" permission="0644" target="/usr/bin/vboxreload">vboxreload</AdditionalFile>
@@ -144,6 +147,20 @@
     </Package>
 
     <History>
+        <Update release="5">
+            <Date>2016-07-22</Date>
+            <Version>5.1.2</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Ergün Salman</Name>
+            <Email>poyraz76@pisilinux.org</Email>
+        </Update>
+        <Update release="4">
+            <Date>2016-07-17</Date>
+            <Version>5.1.0</Version>
+            <Comment>Version Bump</Comment>
+            <Name>Ergün Salman</Name>
+            <Email>poyraz76@pisilinux.org</Email>
+        </Update>
         <Update release="3">
             <Date>2016-06-17</Date>
             <Version>5.1.0b</Version>