[VirtualBox/f25] (12 commits) ...Adjust vboxdrv.rules and move to 60-vboxdrv.rules
by Sérgio M. Basto
Summary of changes:
4ba0682... Set attributes on make install. (*)
d79b3ff... Packaging:Scriptlets review Systemd, Icon Cache, mimeinf an (*)
a3a7f0f... Sync changelog with github.com/sergiomb2/VirtualBox/tree/de (*)
0e3c298... Add changelog. (*)
db091b2... Add back RPMFusion strings to VBox.sh it is used (*)
16604ed... Use PeriodNever like Mageia (*)
4066043... Create VirtualBox-qt sub-package rfbz#1169 (*)
c8da9ca... Upstream rules: (*)
0ed2592... Add Mageia fix revert-VBox.sh.patch (*)
85bb047... Update descriptions and add some comments (*)
42143ce... Review Scriptlets for starting vboxservice.service (*)
de50be8... Adjust vboxdrv.rules and move to 60-vboxdrv.rules (*)
(*) This commit already existed in another branch; no separate mail sent
7 years, 7 months
[ndiswrapper-kmod] Patch for 4.7 kernel
by Leigh Scott
commit 688940420042bad29ac1ee37df9fce0ff6e0db2c
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Mon Sep 19 07:32:20 2016 +0100
Patch for 4.7 kernel
ndiswrapper-4.7-kernel.patch | 13 +++++++++++++
ndiswrapper-kmod.spec | 10 ++++++++--
2 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/ndiswrapper-4.7-kernel.patch b/ndiswrapper-4.7-kernel.patch
new file mode 100644
index 0000000..0159f56
--- /dev/null
+++ b/ndiswrapper-4.7-kernel.patch
@@ -0,0 +1,13 @@
+--- a/driver/wrapndis.c
++++ b/driver/wrapndis.c
+@@ -704,7 +704,9 @@
+ n = wnd->max_tx_packets;
+ n = mp_tx_packets(wnd, wnd->tx_ring_start, n);
+ if (n) {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 31)
+ wnd->net_dev->trans_start = jiffies;
++#endif
+ wnd->tx_ring_start =
+ (wnd->tx_ring_start + n) % TX_RING_SIZE;
+ wnd->is_tx_ring_full = 0;
+
diff --git a/ndiswrapper-kmod.spec b/ndiswrapper-kmod.spec
index 0a0931e..04c66d5 100644
--- a/ndiswrapper-kmod.spec
+++ b/ndiswrapper-kmod.spec
@@ -3,20 +3,22 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels current
+%global buildforkernels akmod
+%global debug_package %{nil}
#global pre rc1
Summary: Ndiswrapper kernel module
Name: ndiswrapper-kmod
Version: 1.60
-Release: 1%{?pre}%{?dist}
+Release: 2%{?pre}%{?dist}
License: GPLv2
Group: System Environment/Kernel
URL: http://ndiswrapper.sourceforge.net
Source0: http://downloads.sf.net/ndiswrapper/ndiswrapper-%{version}%{?pre}.tar.gz
Source11: ndiswrapper-kmodtool-excludekernel-filterfile
Patch0: ndiswrapper-kmod-nomodinfo.patch
+Patch1: ndiswrapper-4.7-kernel.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -48,6 +50,7 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfi
%setup -q -c -T -a 0 -n %{name}-%{version}%{?pre}
(cd ndiswrapper-%{version}%{?pre} ;
%patch0 -p1 -b .orig
+%patch1 -p1 -b .orig
)
sed -i 's|/sbin/depmod -a|/bin/true|' ndiswrapper-%{version}%{?pre}/driver/Makefile
for kernel_version in %{?kernel_versions} ; do
@@ -75,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Sep 19 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1.60-2
+- Patch for 4.7 kernel
+
* Sun Jun 19 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1.60-1
- Update to 1.60
7 years, 7 months
[VirtualBox] Adjust vboxdrv.rules and move to 60-vboxdrv.rules
by Sérgio M. Basto
commit de50be814c96b0f937fc38824d39b86c8d607511
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Sep 19 01:14:57 2016 +0100
Adjust vboxdrv.rules and move to 60-vboxdrv.rules
as has upstream.
Remove Encoding key on .desktop files, Encoding key is deprectated.
Add a new luncher, VBoxBugReport and reorder lunchers as upstream spec
Move more files to sub-packages.
...90-vboxdrv.rules => VirtualBox-60-vboxdrv.rules | 3 +
VirtualBox.spec | 78 +++++++++++++++-------
2 files changed, 56 insertions(+), 25 deletions(-)
---
diff --git a/VirtualBox-90-vboxdrv.rules b/VirtualBox-60-vboxdrv.rules
similarity index 66%
rename from VirtualBox-90-vboxdrv.rules
rename to VirtualBox-60-vboxdrv.rules
index 156358d..fd843f3 100644
--- a/VirtualBox-90-vboxdrv.rules
+++ b/VirtualBox-60-vboxdrv.rules
@@ -1,3 +1,6 @@
+KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600"
+KERNEL=="vboxdrvu", NAME="vboxdrvu", OWNER="root", GROUP="root", MODE="0666"
+KERNEL=="vboxnetctl", NAME="vboxnetctl", OWNER="root", GROUP="root", MODE="0600"
SUBSYSTEM=="usb_device", ACTION=="add", RUN+="VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="VBoxCreateUSBNode.sh --remove $major $minor"
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 32146ac..9f95573 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -33,7 +33,7 @@ Group: Development/Tools
License: GPLv2 or (GPLv2 and CDDL)
URL: http://www.virtualbox.org/wiki/VirtualBox
Source0: http://download.virtualbox.org/virtualbox/%{version}%{?prereltag}/Virtual...
-Source3: VirtualBox-90-vboxdrv.rules
+Source3: VirtualBox-60-vboxdrv.rules
Source5: VirtualBox-60-vboxguest.rules
Source6: VirtualBox.modules
Source7: VirtualBox-guest.modules
@@ -84,6 +84,7 @@ BuildRequires: java-devel >= 1.6
%if %{with docs}
BuildRequires: /usr/bin/pdflatex
BuildRequires: docbook-dtds
+BuildRequires: docbook-style-xsl
BuildRequires: doxygen-latex
BuildRequires: texlive-collection-fontsrecommended
BuildRequires: texlive-ec
@@ -314,24 +315,38 @@ sed -i 's/\r//' COPYING
# really been installed to. Therefore we do not override any of
# the installation paths, but install the tree with the default
# layout under 'obj' and shuffle files around in %%install.
-kmk %{_smp_mflags} \
- KBUILD_VERBOSE=2 TOOL_YASM_AS=yasm PATH_OUT="$PWD/obj" \
+kmk %{_smp_mflags} \
+ KBUILD_VERBOSE=2 \
+ TOOL_YASM_AS=yasm \
+ PATH_OUT="$PWD/obj" \
VBOX_PATH_APP_PRIVATE=%{_libdir}/virtualbox \
VBOX_PATH_APP_DOCS=%{_docdir}/VirtualBox \
VBOX_WITH_TESTCASES= \
VBOX_WITH_VALIDATIONKIT= \
VBOX_WITH_VBOX_IMG=1 \
+ VBOX_WITH_SYSFS_BY_DEFAULT=1 \
+ VBOX_WITH_VMSVGA3D=1 \
VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \
VBOX_USE_SYSTEM_XORG_HEADERS=1 \
%if %{with docs}
VBOX_WITH_DOCS=1 \
+# doc/manual/fr_FR/ missing man_VBoxManage-debugvm.xml and man_VBoxManage-extpack.xml
+# VBOX_WITH_DOCS_TRANSLATIONS=1 \
+# we can't build CHM DOCS we need hhc.exe which is not in source and we need
+# also install wine:
+# wine: cannot find
+# '/builddir/build/BUILD/VirtualBox-5.1.6/tools/win.x86/HTML_Help_Workshop/v1.3//hhc.exe'
+# VBOX_WITH_DOCS_CHM=1 \
%endif
VBOX_PATH_DOCBOOK_DTD=/usr/share/sgml/docbook/xml-dtd-4.5/ \
+ VBOX_PATH_DOCBOOK=/usr/share/sgml/docbook/xsl-stylesheets/ \
VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java \
VBOX_BUILD_PUBLISHER=%{publisher}
-# VBOX_WITH_DOCS_CHM=1 \
-#VBOX_WITH_DOCS_TRANSLATIONS=1
+# VBOX_WITH_ADDITION_DRIVERS = \
+# VBOX_WITH_INSTALLER = 1 \
+# VBOX_WITH_LINUX_ADDITIONS = 1 \
+# VBOX_WITH_X11_ADDITIONS = 1 \
#VBOX_WITH_LIGHTDM_GREETER=1 \
@@ -409,6 +424,8 @@ ln -s VBox %{buildroot}%{_bindir}/VBoxHeadless
ln -s VBox %{buildroot}%{_bindir}/vboxheadless
ln -s VBox %{buildroot}%{_bindir}/VBoxDTrace
ln -s VBox %{buildroot}%{_bindir}/vboxdtrace
+ln -s VBox %{buildroot}%{_bindir}/VBoxBugReport
+ln -s VBox %{buildroot}%{_bindir}/vboxbugreport
ln -s VBox %{buildroot}%{_bindir}/VBoxBalloonCtrl
ln -s VBox %{buildroot}%{_bindir}/vboxballoonctrl
ln -s VBox %{buildroot}%{_bindir}/VBoxAutostart
@@ -416,7 +433,7 @@ ln -s VBox %{buildroot}%{_bindir}/vboxautostart
%if %{with webservice}
ln -s VBox %{buildroot}%{_bindir}/vboxwebsrv
%endif
-ln -s ../../%{_libdir}/virtualbox/vbox-img %{buildroot}%{_bindir}/vbox-img
+ln -s ../..%{_libdir}/virtualbox/vbox-img %{buildroot}%{_bindir}/vbox-img
# Components , preserve symlinks
cp -a obj/bin/components/* %{buildroot}%{_libdir}/virtualbox/components/
@@ -489,12 +506,12 @@ install -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \
%{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
ln -s ../..%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh \
%{buildroot}%{_bindir}/VBoxClient-all
-install -m 0644 -D src/VBox/Additions/x11/Installer/vboxclient.desktop \
- %{buildroot}%{_sysconfdir}/xdg/autostart/vboxclient.desktop
+desktop-file-install --dir=%{buildroot}%{_sysconfdir}/xdg/autostart/ \
+ --remove-key=Encoding src/VBox/Additions/x11/Installer/vboxclient.desktop
desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/vboxclient.desktop
mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-preset
-install -pm 0644 %{SOURCE12} %{buildroot}%{_prefix}/lib/systemd/system-preset/
+install -pm 0644 %{SOURCE12} %{buildroot}%{_prefix}/lib/systemd/system-preset/96-vbox.preset
# Module Source Code
mkdir -p %{name}-kmod-%{version}
@@ -514,7 +531,7 @@ echo 'INSTALL_DIR=%{_libdir}/virtualbox' > %{buildroot}%{_sysconfdir}/vbox/vbox.
# Install udev rules
install -p -m 0755 -D obj/bin/VBoxCreateUSBNode.sh %{buildroot}%{_prefix}/lib/udev/VBoxCreateUSBNode.sh
-install -p -m 0644 -D %{SOURCE3} %{buildroot}%{_udevrulesdir}/90-vboxdrv.rules
+install -p -m 0644 -D %{SOURCE3} %{buildroot}%{_udevrulesdir}/60-vboxdrv.rules
install -p -m 0644 -D %{SOURCE5} %{buildroot}%{_udevrulesdir}/60-vboxguest.rules
# Install modules load script
@@ -523,8 +540,10 @@ install -p -m 0644 -D %{SOURCE7} %{buildroot}%{_prefix}/lib/modules-load.d/%{nam
# Menu entry
desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
- --remove-key=DocPath --vendor='' obj/bin/virtualbox.desktop
+ --remove-key=Encoding obj/bin/virtualbox.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/virtualbox.desktop
+# --remove-key=DocPath
# to review:
#if [ -d ExtensionPacks/VNC ]; then
# install -m 755 -d $RPM_BUILD_ROOT/usr/lib/virtualbox/ExtensionPacks
@@ -638,26 +657,29 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1
%doc obj/bin/UserManual*.pdf
%endif
%license COPYING*
+%{_bindir}/VBoxManage
+%{_bindir}/vboxmanage
+%{_bindir}/VBoxSDL
+%{_bindir}/vboxsdl
%{_bindir}/VBox
-%{_bindir}/vboxballoonctrl
-%{_bindir}/VBoxBalloonCtrl
+%{_bindir}/VBoxVRDP
%{_bindir}/vboxheadless
%{_bindir}/VBoxHeadless
-%{_bindir}/vboxmanage
-%{_bindir}/VBoxManage
-%{_bindir}/vboxsdl
-%{_bindir}/VBoxSDL
-%{_bindir}/VBoxTunctl
-%{_bindir}/virtualbox
-%{_bindir}/VBoxAutostart
-%{_bindir}/vboxautostart
%{_bindir}/VBoxDTrace
%{_bindir}/vboxdtrace
+%{_bindir}/VBoxBugReport
+%{_bindir}/vboxbugreport
+%{_bindir}/VBoxBalloonCtrl
+%{_bindir}/vboxballoonctrl
+%{_bindir}/VBoxAutostart
+%{_bindir}/vboxautostart
%{_bindir}/vbox-img
-%{_bindir}/VBoxVRDP
+%{_bindir}/VBoxTunctl
%dir %{_libdir}/virtualbox
%{_libdir}/virtualbox/*.[^p]*
%exclude %{_libdir}/virtualbox/VirtualBox.so
+%exclude %{_libdir}/virtualbox/VBoxDbg.so
+%exclude %{_libdir}/virtualbox/VBoxPython2_7.so
%{_libdir}/virtualbox/components
%{_libdir}/virtualbox/VBoxExtPackHelperApp
%{_libdir}/virtualbox/VBoxManage
@@ -684,15 +706,17 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1
%{_datadir}/mime/*
%dir %{_sysconfdir}/vbox
%config %{_sysconfdir}/vbox/vbox.cfg
-%{_udevrulesdir}/90-vboxdrv.rules
+%{_udevrulesdir}/60-vboxdrv.rules
%{_prefix}/lib/modules-load.d/%{name}.conf
%{_prefix}/lib/udev/VBoxCreateUSBNode.sh
%files qt
%{_bindir}/VirtualBox
+%{_bindir}/virtualbox
%{_libdir}/virtualbox/VBoxTestOGL
-%{_libdir}/virtualbox/nls
%{_libdir}/virtualbox/VirtualBox.so
+%{_libdir}/virtualbox/VBoxDbg.so
+%{_libdir}/virtualbox/nls
%{_datadir}/pixmaps/*
%{_datadir}/applications/*.desktop
@@ -712,6 +736,7 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1
%{_libdir}/virtualbox/*.py*
%{python2_sitelib}/virtualbox
%{python2_sitelib}/vboxapi*
+%{_libdir}/virtualbox/VBoxPython2_7.so
%{_libdir}/virtualbox/sdk/bindings/xpcom/python
%files guest-additions
@@ -732,7 +757,6 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1
%{_unitdir}/vboxservice.service
%{_prefix}/lib/systemd/system-preset/96-vbox.preset
-
%files kmodsrc
%{_datadir}/%{name}-kmod-%{version}
@@ -751,6 +775,10 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1
- Update descriptions
- Review Scriptlets for starting vboxservice.service in guest-additions
https://fedoraproject.org/wiki/Starting_services_by_default
+- Adjust vboxdrv.rules and move to 60-vboxdrv.rules as has upstream.
+- Remove Encoding key on .desktop files, Encoding key is deprectated.
+- Add a new luncher, VBoxBugReport and reorder lunchers as upstream spec
+- Move more files to sub-packages.
* Tue Sep 13 2016 Sérgio Basto <sergio(a)serjux.com> - 5.1.6-1
- Update VBox to 5.1.6
7 years, 7 months
[VirtualBox] Review Scriptlets for starting vboxservice.service
by Sérgio M. Basto
commit 42143ce009671b631f3fca6e7ff998ef86aeb467
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Sep 18 02:09:34 2016 +0100
Review Scriptlets for starting vboxservice.service
in guest-additions
https://fedoraproject.org/wiki/Starting_services_by_default
96-vbox.preset | 7 +++++++
VirtualBox.spec | 9 +++++++--
2 files changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/96-vbox.preset b/96-vbox.preset
new file mode 100644
index 0000000..85dde97
--- /dev/null
+++ b/96-vbox.preset
@@ -0,0 +1,7 @@
+# Also see:
+# https://fedoraproject.org/wiki/Starting_services_by_default
+
+# Installing presets is not the preferred solution but until another one
+# presents itself:
+# https://bugzilla.rpmfusion.org/show_bug.cgi?id=3713
+enable vboxservice.service
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 0e3536a..32146ac 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -39,6 +39,7 @@ Source6: VirtualBox.modules
Source7: VirtualBox-guest.modules
Source10: vboxweb.service
Source11: vboxservice.service
+Source12: 96-vbox.preset
Source20: os_mageia.png
Source21: os_mageia_64.png
Patch1: VirtualBox-OSE-4.1.4-noupdate.patch
@@ -492,6 +493,9 @@ install -m 0644 -D src/VBox/Additions/x11/Installer/vboxclient.desktop \
%{buildroot}%{_sysconfdir}/xdg/autostart/vboxclient.desktop
desktop-file-validate %{buildroot}%{_sysconfdir}/xdg/autostart/vboxclient.desktop
+mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-preset
+install -pm 0644 %{SOURCE12} %{buildroot}%{_prefix}/lib/systemd/system-preset/
+
# Module Source Code
mkdir -p %{name}-kmod-%{version}
cp -al obj/bin/src/vbox* obj/bin/additions/src/vbox* %{name}-kmod-%{version}
@@ -606,8 +610,6 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1
# vboxservice
/bin/systemctl restart systemd-modules-load.service >/dev/null 2>&1 || :
%systemd_post vboxservice.service
-/bin/systemctl enable vboxservice.service >/dev/null 2>&1 || :
-/bin/systemctl restart vboxservice.service >/dev/null 2>&1 || :
#chcon -u system_u -t mount_exec_t "$lib_path/$PACKAGE/mount.vboxsf" > /dev/null 2>&1
# for i in "$lib_path"/*.so
@@ -728,6 +730,7 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1
%{_udevrulesdir}/60-vboxguest.rules
%{_prefix}/lib/modules-load.d/%{name}-guest.conf
%{_unitdir}/vboxservice.service
+%{_prefix}/lib/systemd/system-preset/96-vbox.preset
%files kmodsrc
@@ -746,6 +749,8 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1
- Add Mageia fix revert-VBox.sh.patch
- Add Mageia support
- Update descriptions
+- Review Scriptlets for starting vboxservice.service in guest-additions
+ https://fedoraproject.org/wiki/Starting_services_by_default
* Tue Sep 13 2016 Sérgio Basto <sergio(a)serjux.com> - 5.1.6-1
- Update VBox to 5.1.6
7 years, 7 months
[VirtualBox] Update descriptions and add some comments
by Sérgio M. Basto
commit 85bb0473f792eded0d13bb1828dd48f412010a21
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Sep 18 00:21:18 2016 +0100
Update descriptions and add some comments
VirtualBox.spec | 30 ++++++++++++++++++++++--------
1 file changed, 22 insertions(+), 8 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index a8b182d..0e3536a 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -147,8 +147,17 @@ Conflicts: %{name}-guest <= %{version}-%{release}
Conflicts: %{name}-guest-additions <= %{version}-%{release}
%description
-A general-purpose full virtualizer and emulator for 32-bit and
-64-bit x86 based PC-compatible machines.
+VirtualBox is a powerful x86 and AMD64/Intel64 virtualization product for
+enterprise as well as home use. Not only is VirtualBox an extremely feature
+rich, high performance product for enterprise customers, it is also the only
+professional solution that is freely available as Open Source Software under
+the terms of the GNU General Public License (GPL) version 2.
+
+Presently, VirtualBox runs on Windows, Linux, Macintosh, and Solaris hosts and
+supports a large number of guest operating systems including but not limited to
+Windows (NT 4.0, 2000, XP, Server 2003, Vista, Windows 7, Windows 8, Windows
+10), DOS/Windows 3.x, Linux (2.4, 2.6, 3.x and 4.x), Solaris and OpenSolaris,
+OS/2, and OpenBSD.
%package qt
Summary: Qt GUI part for %{name}
@@ -208,13 +217,14 @@ Conflicts: %{name} <= %{version}-%{release}
%description guest-additions
-Important note: VirtualBox-guest can't be installed on Host (master) system because
-contains X11 and OpenGL drives that will mess up with your X11 configurations.
+Important note: VirtualBox-guest-additions can't be installed on Host (master)
+system because contains X11 and OpenGL drives that will mess up with your X11
+configurations.
This subpackage replace Oracle Linux Guest Addition but just for Fedora,
therefore should be installed only when we have one Fedora as a guest system.
-Tools that use kernel modules for supporting integration
-with the Host, including file sharing, clipboard sharing,
-X.org X11 video and mouse driver, USB and webcam proxy and Seamless mode.
+Tools that use kernel modules for supporting integration with the Host,
+including file sharing, clipboard sharing, X.org X11 video and mouse driver,
+USB and webcam proxy and Seamless mode.
%package kmodsrc
@@ -238,10 +248,13 @@ rm -r tools/
# Remove bundle X11 sources and some lib sources, before patching.
rm -r src/VBox/Additions/x11/x11include/
rm -r src/VBox/Additions/x11/x11stubs/
-#rm -r src/VBox/GuestHost/OpenGL/include/GL
rm include/VBox/HostServices/glext.h
rm include/VBox/HostServices/glxext.h
+
+# wglext.h has typedefs for Windows-specific extensions
#rm include/VBox/HostServices/wglext.h
+# src/VBox/GuestHost/OpenGL/include/GL/glext.h have VBOX definitions
+#rm -r src/VBox/GuestHost/OpenGL/include/GL
#rm -rf src/libs/liblzf-3.4/
rm -r src/libs/libxml2-2.9.2/
@@ -732,6 +745,7 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1
Add a group "vboxsf" for Shared Folders access
- Add Mageia fix revert-VBox.sh.patch
- Add Mageia support
+- Update descriptions
* Tue Sep 13 2016 Sérgio Basto <sergio(a)serjux.com> - 5.1.6-1
- Update VBox to 5.1.6
7 years, 7 months
[VirtualBox] Add Mageia fix revert-VBox.sh.patch
by Sérgio M. Basto
commit 0ed25920e9862303d7728473aa6de5c552d15ac3
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sun Sep 18 00:07:05 2016 +0100
Add Mageia fix revert-VBox.sh.patch
Add Mageia support
VirtualBox-5.1.0-add-Mageia-support.patch | 208 ++++++++++++++++++++++++++++++
VirtualBox-5.1.0-revert-VBox.sh.patch | 55 ++++++++
VirtualBox.spec | 18 ++-
os_mageia.png | Bin 0 -> 4254 bytes
os_mageia_64.png | Bin 0 -> 4254 bytes
5 files changed, 274 insertions(+), 7 deletions(-)
---
diff --git a/VirtualBox-5.1.0-add-Mageia-support.patch b/VirtualBox-5.1.0-add-Mageia-support.patch
new file mode 100644
index 0000000..258f651
--- /dev/null
+++ b/VirtualBox-5.1.0-add-Mageia-support.patch
@@ -0,0 +1,208 @@
+diff -Nurp VirtualBox-5.1.0.p9/include/VBox/ostypes.h VirtualBox-5.1.0.p13/include/VBox/ostypes.h
+--- VirtualBox-5.1.0.p9/include/VBox/ostypes.h 2016-07-12 17:47:24.000000000 +0300
++++ VirtualBox-5.1.0.p13/include/VBox/ostypes.h 2016-07-13 01:03:14.386225692 +0300
+@@ -106,6 +106,8 @@ typedef enum VBOXOSTYPE
+ VBOXOSTYPE_Xandros_x64 = 0x5D100,
+ VBOXOSTYPE_Oracle = 0x5E000,
+ VBOXOSTYPE_Oracle_x64 = 0x5E100,
++ VBOXOSTYPE_Mageia = 0x5F000,
++ VBOXOSTYPE_Mageia_x64 = 0x5F100,
+ VBOXOSTYPE_FreeBSD = 0x60000,
+ VBOXOSTYPE_FreeBSD_x64 = 0x60100,
+ VBOXOSTYPE_OpenBSD = 0x61000,
+diff -Nurp VirtualBox-5.1.0.p9/src/VBox/Additions/linux/installer/vboxadd-x11.sh VirtualBox-5.1.0.p13/src/VBox/Additions/linux/installer/vboxadd-x11.sh
+--- VirtualBox-5.1.0.p9/src/VBox/Additions/linux/installer/vboxadd-x11.sh 2016-07-12 17:47:43.000000000 +0300
++++ VirtualBox-5.1.0.p13/src/VBox/Additions/linux/installer/vboxadd-x11.sh 2016-07-13 01:03:14.387225695 +0300
+@@ -134,8 +134,14 @@ install_x11_startup_app() {
+ x11_autostart="/etc/xdg/autostart"
+ kde_autostart="/usr/share/autostart"
+ redhat_dir=/etc/X11/Xsession.d
++ mageia_dir=/etc/X11/xinit.d
+ mandriva_dir=/etc/X11/xinit.d
+ debian_dir=/etc/X11/xinit/xinitrc.d
++ if [ -d "$mageia_dir" -a -w "$mageia_dir" -a -x "$mageia_dir" ]
++ then
++ install -m 0644 $app_src "$mageia_dir/$app_dest"
++ found=1
++ fi
+ if [ -d "$mandriva_dir" -a -w "$mandriva_dir" -a -x "$mandriva_dir" ]
+ then
+ install -m 0644 $app_src "$mandriva_dir/$app_dest"
+diff -Nurp VirtualBox-5.1.0.p9/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp VirtualBox-5.1.0.p13/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp
+--- VirtualBox-5.1.0.p9/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2016-07-12 17:54:02.000000000 +0300
++++ VirtualBox-5.1.0.p13/src/VBox/Frontends/VirtualBox/src/globals/UIIconPool.cpp 2016-07-13 01:03:14.387225695 +0300
+@@ -314,6 +314,8 @@ UIIconPoolGeneral::UIIconPoolGeneral()
+ m_guestOSTypeIconNames.insert("Fedora_64", ":/os_fedora_64.png");
+ m_guestOSTypeIconNames.insert("Gentoo", ":/os_gentoo.png");
+ m_guestOSTypeIconNames.insert("Gentoo_64", ":/os_gentoo_64.png");
++ m_guestOSTypeIconNames.insert("Mageia", ":/os_mageia.png");
++ m_guestOSTypeIconNames.insert("Mageia_64", ":/os_mageia_64.png");
+ m_guestOSTypeIconNames.insert("Mandriva", ":/os_mandriva.png");
+ m_guestOSTypeIconNames.insert("Mandriva_64", ":/os_mandriva_64.png");
+ m_guestOSTypeIconNames.insert("RedHat", ":/os_redhat.png");
+diff -Nurp VirtualBox-5.1.0.p9/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp VirtualBox-5.1.0.p13/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
+--- VirtualBox-5.1.0.p9/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2016-07-12 17:54:13.000000000 +0300
++++ VirtualBox-5.1.0.p13/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp 2016-07-13 01:03:14.387225695 +0300
+@@ -136,8 +136,10 @@ static const osTypePattern gs_OSTypePatt
+ { QRegExp("Fe.*32", Qt::CaseInsensitive), "Fedora" },
+ { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" },
+ { QRegExp("((Gen)|(Sab)).*32", Qt::CaseInsensitive), "Gentoo" },
+- { QRegExp("((Man)|(Mag)).*64", Qt::CaseInsensitive), "Mandriva_64" },
+- { QRegExp("((Man)|(Mag)).*32", Qt::CaseInsensitive), "Mandriva" },
++ { QRegExp("Mag.*64", Qt::CaseInsensitive), "Mageia_64" },
++ { QRegExp("Mag", Qt::CaseInsensitive), "Mageia" },
++ { QRegExp("Man.*64", Qt::CaseInsensitive), "Mandriva_64" },
++ { QRegExp("Man", Qt::CaseInsensitive), "Mandriva" },
+ { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" },
+ { QRegExp("((Red)|(rhel)|(cen)).*32", Qt::CaseInsensitive), "RedHat" },
+ { QRegExp("Tur.*64", Qt::CaseInsensitive), "Turbolinux_64" },
+diff -Nurp VirtualBox-5.1.0.p9/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc VirtualBox-5.1.0.p13/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc
+--- VirtualBox-5.1.0.p9/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc 2016-07-12 17:53:54.000000000 +0300
++++ VirtualBox-5.1.0.p13/src/VBox/Frontends/VirtualBox/VirtualBox1.qrc 2016-07-13 01:03:14.387225695 +0300
+@@ -250,6 +250,8 @@
+ <file alias="os_linux_other.png">images/os_linux_other.png</file>
+ <file alias="os_macosx.png">images/os_macosx.png</file>
+ <file alias="os_macosx_64.png">images/os_macosx_64.png</file>
++ <file alias="os_mageia.png">images/os_mageia.png</file>
++ <file alias="os_mageia_64.png">images/os_mageia_64.png</file>
+ <file alias="os_mandriva.png">images/os_mandriva.png</file>
+ <file alias="os_mandriva_64.png">images/os_mandriva_64.png</file>
+ <file alias="os_netbsd.png">images/os_netbsd.png</file>
+diff -Nurp VirtualBox-5.1.0.p9/src/VBox/Installer/linux/distributions_rpm VirtualBox-5.1.0.p13/src/VBox/Installer/linux/distributions_rpm
+--- VirtualBox-5.1.0.p9/src/VBox/Installer/linux/distributions_rpm 2016-07-12 17:54:27.000000000 +0300
++++ VirtualBox-5.1.0.p13/src/VBox/Installer/linux/distributions_rpm 2016-07-13 01:48:15.300500433 +0300
+@@ -5,6 +5,16 @@ openSUSE114 = OPENSUSE_11_4
+ openSUSE113 = OPENSUSE_11_3
+ sles11.0 = SLES_11_0
+ sles10.1 = SLES_10_1
++mga10 = MAGEIA_10
++mga9 = MAGEIA_9
++mga8 = MAGEIA_8
++mga7 = MAGEIA_7
++mga6 = MAGEIA_6
++mga5 = MAGEIA_5
++mga4 = MAGEIA_4
++mga3 = MAGEIA_3
++mga2 = MAGEIA_2
++mga1 = MAGEIA_1
+ mdv2011.0 = MANDRIVA_2011_0
+ fedora24 = FEDORA_24
+ fedora22 = FEDORA_22
+diff -Nurp VirtualBox-5.1.0.p9/src/VBox/Installer/linux/VBoxSysInfo.sh VirtualBox-5.1.0.p13/src/VBox/Installer/linux/VBoxSysInfo.sh
+--- VirtualBox-5.1.0.p9/src/VBox/Installer/linux/VBoxSysInfo.sh 2016-07-12 17:54:27.000000000 +0300
++++ VirtualBox-5.1.0.p13/src/VBox/Installer/linux/VBoxSysInfo.sh 2016-07-13 01:03:14.387225695 +0300
+@@ -43,6 +43,11 @@ get_linux_info () {
+ # Debian-based system
+ release=`cat /etc/debian_version`
+ print_linux_info "Debian" $release
++ elif [ -r /etc/mageia-release ]
++ then
++ # Mageia-based system
++ release=`cat /etc/mageia-release | sed -e 's/[A-Za-z ]* release //'`
++ print_linux_info "Mageia" $release
+ elif [ -r /etc/mandriva-release ]
+ then
+ # Mandriva-based system
+diff -Nurp VirtualBox-5.1.0.p9/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h VirtualBox-5.1.0.p13/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h
+--- VirtualBox-5.1.0.p9/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h 2016-07-12 17:54:29.000000000 +0300
++++ VirtualBox-5.1.0.p13/src/VBox/Main/cbinding/VBoxCAPI_v2_2.h 2016-07-13 01:03:14.388225698 +0300
+@@ -921,7 +921,9 @@ enum CIMOSType
+ CIMOSType_CIMOS_Linux_2_6_x = 99,
+ CIMOSType_CIMOS_Linux_2_6_x_64 = 100,
+ CIMOSType_CIMOS_Linux_64 = 101,
+- CIMOSType_CIMOS_Other_64 = 102
++ CIMOSType_CIMOS_Other_64 = 102,
++ CIMOSType_CIMOS_Mageia = 111,
++ CIMOSType_CIMOS_Mageia_64 = 112
+ };
+ /* End of enum CIMOSType Declaration */
+
+diff -Nurp VirtualBox-5.1.0.p9/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h VirtualBox-5.1.0.p13/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h
+--- VirtualBox-5.1.0.p9/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h 2016-07-12 17:54:29.000000000 +0300
++++ VirtualBox-5.1.0.p13/src/VBox/Main/cbinding/VBoxCAPI_v3_0.h 2016-07-13 01:03:14.388225698 +0300
+@@ -1371,7 +1371,9 @@ enum CIMOSType
+ CIMOSType_CIMOS_Linux_2_6_x = 99,
+ CIMOSType_CIMOS_Linux_2_6_x_64 = 100,
+ CIMOSType_CIMOS_Linux_64 = 101,
+- CIMOSType_CIMOS_Other_64 = 102
++ CIMOSType_CIMOS_Other_64 = 102,
++ CIMOSType_CIMOS_Mageia = 111,
++ CIMOSType_CIMOS_Mageia_64 = 112
+ };
+ /* End of enum CIMOSType Declaration */
+
+diff -Nurp VirtualBox-5.1.0.p9/src/VBox/Main/include/ovfreader.h VirtualBox-5.1.0.p13/src/VBox/Main/include/ovfreader.h
+--- VirtualBox-5.1.0.p9/src/VBox/Main/include/ovfreader.h 2016-07-12 17:54:32.000000000 +0300
++++ VirtualBox-5.1.0.p13/src/VBox/Main/include/ovfreader.h 2016-07-13 01:03:14.388225698 +0300
+@@ -174,8 +174,10 @@ enum CIMOSType_T
+ CIMOSType_CIMOS_CentOS_64 = 107,
+ CIMOSType_CIMOS_OracleEnterpriseLinux = 108,
+ CIMOSType_CIMOS_OracleEnterpriseLinux_64 = 109,
+- CIMOSType_CIMOS_eComStation = 110
++ CIMOSType_CIMOS_eComStation = 110,
+ // no new types added with CIM 2.26.0
++ CIMOSType_CIMOS_Mageia = 111,
++ CIMOSType_CIMOS_Mageia_64 = 112
+ };
+
+ enum OVFVersion_T
+diff -Nurp VirtualBox-5.1.0.p9/src/VBox/Main/src-all/Global.cpp VirtualBox-5.1.0.p13/src/VBox/Main/src-all/Global.cpp
+--- VirtualBox-5.1.0.p9/src/VBox/Main/src-all/Global.cpp 2016-07-12 17:54:32.000000000 +0300
++++ VirtualBox-5.1.0.p13/src/VBox/Main/src-all/Global.cpp 2016-07-13 01:15:39.558448702 +0300
+@@ -245,6 +245,17 @@ const Global::OSType Global::sOSTypes[]
+ 1024, 16, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97, AudioCodecType_AD1980 },
+
++ { "Linux", "Linux", "Mageia", "Mageia (32-bit)",
++ VBOXOSTYPE_Mageia, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
++ 1024, 16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_AD1980 },
++
++ { "Linux", "Linux", "Mageia_64", "Mageia (64-bit)",
++ VBOXOSTYPE_Mageia_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC
++ | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
++ 1024, 16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
++ StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA, AudioCodecType_AD1980 },
++
+ { "Linux", "Linux", "Mandriva", "Mandriva (32-bit)",
+ VBOXOSTYPE_Mandriva, VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET | VBOXOSHINT_X2APIC,
+ 1024, 16, 8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
+diff -Nurp VirtualBox-5.1.0.p9/src/VBox/Main/src-server/ApplianceImpl.cpp VirtualBox-5.1.0.p13/src/VBox/Main/src-server/ApplianceImpl.cpp
+--- VirtualBox-5.1.0.p9/src/VBox/Main/src-server/ApplianceImpl.cpp 2016-07-12 17:54:34.000000000 +0300
++++ VirtualBox-5.1.0.p13/src/VBox/Main/src-server/ApplianceImpl.cpp 2016-07-13 01:03:14.389225700 +0300
+@@ -163,6 +163,8 @@ g_osTypes[] =
+ { ovf::CIMOSType_CIMOS_SunJavaDesktopSystem, VBOXOSTYPE_Linux },
+ { ovf::CIMOSType_CIMOS_TurboLinux, VBOXOSTYPE_Turbolinux },
+ { ovf::CIMOSType_CIMOS_TurboLinux_64, VBOXOSTYPE_Turbolinux_x64 },
++ { ovf::CIMOSType_CIMOS_Mageia, VBOXOSTYPE_Mageia },
++ { ovf::CIMOSType_CIMOS_Mageia_64, VBOXOSTYPE_Mageia_x64 },
+ { ovf::CIMOSType_CIMOS_Mandriva, VBOXOSTYPE_Mandriva },
+ { ovf::CIMOSType_CIMOS_Mandriva_64, VBOXOSTYPE_Mandriva_x64 },
+ { ovf::CIMOSType_CIMOS_Ubuntu, VBOXOSTYPE_Ubuntu },
+@@ -226,6 +228,7 @@ static const osTypePattern g_osTypesPatt
+ {"SUSE", VBOXOSTYPE_OpenSUSE},
+ {"Novell", VBOXOSTYPE_OpenSUSE},
+ {"Red Hat", VBOXOSTYPE_RedHat},
++ {"Mageia", VBOXOSTYPE_Mageia},
+ {"Mandriva", VBOXOSTYPE_Mandriva},
+ {"Ubuntu", VBOXOSTYPE_Ubuntu},
+ {"Debian", VBOXOSTYPE_Debian},
+@@ -255,6 +258,7 @@ static const osTypePattern g_osTypesPatt
+ {"SUSE", VBOXOSTYPE_OpenSUSE_x64},
+ {"Novell", VBOXOSTYPE_OpenSUSE_x64},
+ {"Red Hat", VBOXOSTYPE_RedHat_x64},
++ {"Mageia", VBOXOSTYPE_Mageia_x64},
+ {"Mandriva", VBOXOSTYPE_Mandriva_x64},
+ {"Ubuntu", VBOXOSTYPE_Ubuntu_x64},
+ {"Debian", VBOXOSTYPE_Debian_x64},
+diff -Nurp VirtualBox-5.1.0.p9/src/VBox/Main/xml/Settings.cpp VirtualBox-5.1.0.p13/src/VBox/Main/xml/Settings.cpp
+--- VirtualBox-5.1.0.p9/src/VBox/Main/xml/Settings.cpp 2016-07-12 17:54:37.000000000 +0300
++++ VirtualBox-5.1.0.p13/src/VBox/Main/xml/Settings.cpp 2016-07-13 01:03:14.390225702 +0300
+@@ -4960,6 +4960,7 @@ const struct {
+ { "opensuse", "OpenSUSE" },
+ { "fedoracore", "Fedora" },
+ { "gentoo", "Gentoo" },
++ { "mageia", "Mageia" },
+ { "mandriva", "Mandriva" },
+ { "redhat", "RedHat" },
+ { "ubuntu", "Ubuntu" },
diff --git a/VirtualBox-5.1.0-revert-VBox.sh.patch b/VirtualBox-5.1.0-revert-VBox.sh.patch
new file mode 100644
index 0000000..1e53b84
--- /dev/null
+++ b/VirtualBox-5.1.0-revert-VBox.sh.patch
@@ -0,0 +1,55 @@
+diff -Nurp VirtualBox-5.1.0.p22/src/VBox/Installer/linux/VBox.sh VirtualBox-5.1.0.p23/src/VBox/Installer/linux/VBox.sh
+--- VirtualBox-5.1.0.p22/src/VBox/Installer/linux/VBox.sh 2016-07-12 17:54:27.000000000 +0300
++++ VirtualBox-5.1.0.p23/src/VBox/Installer/linux/VBox.sh 2016-07-14 01:48:00.190882001 +0300
+@@ -16,40 +16,18 @@
+ #
+
+ PATH="/usr/bin:/bin:/usr/sbin:/sbin"
++CONFIG="/etc/vbox/vbox.cfg"
+
+-# The below is GNU-specific. See slightly further down for a version which
+-# works on Solaris and OS X.
+-TARGET=`readlink -e -- "${0}"` || exit 1
+-MY_DIR="${TARGET%/[!/]*}"
+-
+-# (
+-# path="${0}"
+-# while test -n "${path}"; do
+-# # Make sure we have at least one slash and no leading dash.
+-# expr "${path}" : / > /dev/null || path="./${path}"
+-# # Filter out bad characters in the path name.
+-# expr "${path}" : ".*[*?<>\\]" > /dev/null && exit 1
+-# # Catch embedded new-lines and non-existing (or path-relative) files.
+-# # $0 should always be absolute when scripts are invoked through "#!".
+-# test "`ls -l -d "${path}" 2> /dev/null | wc -l`" -eq 1 || exit 1
+-# # Change to the folder containing the file to resolve relative links.
+-# folder=`expr "${path}" : "\(.*/\)[^/][^/]*/*$"` || exit 1
+-# path=`expr "x\`ls -l -d "${path}"\`" : "[^>]* -> \(.*\)"`
+-# cd "${folder}"
+-# # If the last path was not a link then we are in the target folder.
+-# test -n "${path}" || pwd
+-# done
+-# )
+-
+-if test -f /usr/lib/virtualbox/VirtualBox &&
+- test -x /usr/lib/virtualbox/VirtualBox; then
+- INSTALL_DIR=/usr/lib/virtualbox
+-elif test -f "${MY_DIR}/VirtualBox" && test -x "${MY_DIR}/VirtualBox"; then
+- INSTALL_DIR="${MY_DIR}"
+-else
+- echo "Could not find VirtualBox installation. Please reinstall."
+- exit 1
+-fi
++test -r "${CONFIG}" &&
++ . "${CONFIG}"
++test -z "${INSTALL_DIR}" &&
++ if test -f /usr/lib/virtualbox/VirtualBox &&
++ test -x /usr/lib/virtualbox/VirtualBox; then
++ INSTALL_DIR=/usr/lib/virtualbox
++ else
++ echo "Could not find VirtualBox installation. Please reinstall."
++ exit 1
++ fi
+
+ # Note: This script must not fail if the module was not successfully installed
+ # because the user might not want to run a VM but only change VM params!
diff --git a/VirtualBox.spec b/VirtualBox.spec
index f973366..a8b182d 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -39,6 +39,8 @@ Source6: VirtualBox.modules
Source7: VirtualBox-guest.modules
Source10: vboxweb.service
Source11: vboxservice.service
+Source20: os_mageia.png
+Source21: os_mageia_64.png
Patch1: VirtualBox-OSE-4.1.4-noupdate.patch
Patch2: VirtualBox-5.1.0-strings.patch
Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
@@ -54,6 +56,9 @@ Patch29: 29-fix-ftbfs-as-needed.patch
Patch34: VirtualBox-5.0.16-glibc.patch
Patch35: VirtualBox-5.0.22-guest_soname.patch
Patch37: smap.diff
+# from Mageia
+Patch50: VirtualBox-5.1.0-add-Mageia-support.patch
+Patch51: VirtualBox-5.1.0-revert-VBox.sh.patch
BuildRequires: kBuild >= 0.1.9998
@@ -224,6 +229,8 @@ which is generated during the build of main package.
%prep
%setup -q
find -name '*.py[co]' -delete
+# add Mageia images
+cp -a %{SOURCE20} %{SOURCE21} src/VBox/Frontends/VirtualBox/images/
# Remove prebuilt binary tools
rm -r kBuild/
@@ -260,17 +267,12 @@ rm -r src/libs/zlib-1.2.8/
%endif
%patch35 -p1 -b .soname
%patch37 -p1 -b .kernel4.7-smap
+%patch50 -p1 -b .mageia-support
+%patch51 -p1 -b .revert-VBox.sh
# CRLF->LF
sed -i 's/\r//' COPYING
-# Fix the library path in wrapper script for 64-bit; otherwise, it will
-# find itself as the VirtualBox executable, and end up in endless call
-# loop...
-%ifarch x86_64
-sed -i 's@/usr/lib@/usr/lib64@' src/VBox/Installer/linux/VBox.sh
-%endif
-
%build
./configure --disable-kmods \
%if %{with webservice}
@@ -728,6 +730,8 @@ getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1
- Upstream rules:
60-vboxguest.rules change user to vboxadd security reasons
Add a group "vboxsf" for Shared Folders access
+- Add Mageia fix revert-VBox.sh.patch
+- Add Mageia support
* Tue Sep 13 2016 Sérgio Basto <sergio(a)serjux.com> - 5.1.6-1
- Update VBox to 5.1.6
diff --git a/os_mageia.png b/os_mageia.png
new file mode 100644
index 0000000..44f0fb5
Binary files /dev/null and b/os_mageia.png differ
diff --git a/os_mageia_64.png b/os_mageia_64.png
new file mode 100644
index 0000000..5f6a1b9
Binary files /dev/null and b/os_mageia_64.png differ
7 years, 7 months
[VirtualBox] Upstream rules:
by Sérgio M. Basto
commit c8da9cad6f8550e2609cfccbe3f5426901c772a7
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Sat Sep 17 08:04:16 2016 +0100
Upstream rules:
60-vboxguest.rules change user to vboxadd security reasons
Add a group "vboxsf" for Shared Folders access
All users which want to access the auto-mounted Shared Folders have to
be added to this group.
VirtualBox-60-vboxguest.rules | 4 ++--
VirtualBox.spec | 30 ++++++++++++++++--------------
2 files changed, 18 insertions(+), 16 deletions(-)
---
diff --git a/VirtualBox-60-vboxguest.rules b/VirtualBox-60-vboxguest.rules
index 6285f72..061eec0 100644
--- a/VirtualBox-60-vboxguest.rules
+++ b/VirtualBox-60-vboxguest.rules
@@ -1,2 +1,2 @@
-ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600"
-ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666"
+KERNEL=="vboxguest", NAME="vboxguest", OWNER="vboxadd", MODE="0660"
+KERNEL=="vboxuser", NAME="vboxuser", OWNER="vboxadd", MODE="0666"
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 123e51a..f973366 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -518,10 +518,11 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications \
#
# vboxautostart-service
-%post
+%pre
# Group for USB devices
getent group vboxusers >/dev/null || groupadd -r vboxusers
+%post
# Icon Cache
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
# mimeinfo F23 only
@@ -573,6 +574,16 @@ fi
# mimeinfo F23 only
/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
+%pre guest-additions
+# This is the LSB version of useradd and should work on recent
+# distributions
+getent passwd vboxadd >/dev/null || useradd -d /var/run/vboxadd -g 1 -r -s /bin/false vboxadd 2>&1
+
+# Add a group "vboxsf" for Shared Folders access
+# All users which want to access the auto-mounted Shared Folders have to
+# be added to this group.
+getent group vboxsf >/dev/null || groupadd -r vboxsf 2>&1
+
# Guest additions install
%post guest-additions
/sbin/ldconfig
@@ -582,18 +593,7 @@ fi
%systemd_post vboxservice.service
/bin/systemctl enable vboxservice.service >/dev/null 2>&1 || :
/bin/systemctl restart vboxservice.service >/dev/null 2>&1 || :
-## This is the LSB version of useradd and should work on recent
-## distributions
-#useradd -d /var/run/vboxadd -g 1 -r -s /bin/false vboxadd >/dev/null 2>&1
-## And for the others, we choose a UID ourselves
-#useradd -d /var/run/vboxadd -g 1 -u 501 -o -s /bin/false vboxadd >/dev/null 2>&1
-#
-## Add a group "vboxsf" for Shared Folders access
-## All users which want to access the auto-mounted Shared Folders have to
-## be added to this group.
-#groupadd -r -f vboxsf >/dev/null 2>&1
-#echo "KERNEL=${udev_fix}\"vboxguest\", NAME=\"vboxguest\", OWNER=\"vboxadd\", MODE=\"0660\"" > /etc/udev/rules.d/60-vboxadd.rules
-#echo "KERNEL=${udev_fix}\"vboxuser\", NAME=\"vboxuser\", OWNER=\"vboxadd\", MODE=\"0666\"" >> /etc/udev/rules.d/60-vboxadd.rules
+
#chcon -u system_u -t mount_exec_t "$lib_path/$PACKAGE/mount.vboxsf" > /dev/null 2>&1
# for i in "$lib_path"/*.so
# do
@@ -608,7 +608,6 @@ fi
#chcon -t unconfined_execmem_exec_t '/usr/bin/VBoxClient' > /dev/null 2>&1
#semanage fcontext -a -t unconfined_execmem_exec_t '/usr/bin/VBoxClient' > /dev/null 2>&1
-
%preun guest-additions
%systemd_preun vboxservice.service
@@ -726,6 +725,9 @@ fi
- Create VirtualBox-qt sub-package rfbz#1169
- Create VirtualBox-webservice in a sub-package
- Add python things to python sub-package
+- Upstream rules:
+ 60-vboxguest.rules change user to vboxadd security reasons
+ Add a group "vboxsf" for Shared Folders access
* Tue Sep 13 2016 Sérgio Basto <sergio(a)serjux.com> - 5.1.6-1
- Update VBox to 5.1.6
7 years, 7 months