commit c1ff66e94cabf1a1bf56a567413eaa2a0cc32170 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Sat Jul 25 20:14:23 2020 +0100 Update VBox to 6.1.12 From Debian disable cloud_net "Fix build failure due to missing upstream file" VirtualBox-6.1.4-Xwayland-shortcut-inhibit.patch | 45 ------------------------ VirtualBox.spec | 23 +++++++----- sources | 4 +-- update_vbox.sh | 7 ++-- vboxservice.service | 1 + 5 files changed, 21 insertions(+), 59 deletions(-) --- diff --git a/VirtualBox.spec b/VirtualBox.spec index 08dc1fd..acbd0ce 100644 --- a/VirtualBox.spec +++ b/VirtualBox.spec @@ -16,7 +16,7 @@ #global prerel RC1 %global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')} -%ifarch x86_64 +%ifarch x86_64 || 0%{?fedora} > 32 %bcond_without webservice %else %bcond_with webservice @@ -45,8 +45,8 @@ %endif Name: VirtualBox -Version: 6.1.10 -Release: 5%{?dist} +Version: 6.1.12 +Release: 1%{?dist} Summary: A general-purpose full virtualizer for PC hardware License: GPLv2 or (GPLv2 and CDDL) @@ -94,7 +94,6 @@ Patch61: 0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch Patch70: vbox-python-detection.diff Patch80: VirtualBox-6.1.4-gcc10.patch -Patch85: VirtualBox-6.1.4-Xwayland-shortcut-inhibit.patch Patch86: VirtualBox-6.1.0-VBoxRem.patch @@ -344,8 +343,7 @@ rm -r src/libs/zlib-1.2.*/ %patch60 -p1 -b .xclient %patch61 -p1 -b .automount %patch70 -p1 -b .python-detection -%patch80 -p1 -b .hack -%patch85 -p1 -b .wayland2 +%patch80 -p1 -b .gcc10 %patch86 -p1 -b .vboxrem @@ -404,6 +402,7 @@ kmk %{_smp_mflags} \ %{?with_docs: VBOX_WITH_DOCS=1 } \ VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java \ VBOX_WITH_UPDATE_REQUEST= \ + VBOX_WITH_CLOUD_NET= \ VBOX_WITHOUT_PRECOMPILED_HEADERS=1 \ VBOX_BUILD_PUBLISHER=%{publisher} @@ -532,13 +531,15 @@ install -p -m 0755 -t %{buildroot}%{_libdir}/virtualbox/nls \ # Python %if %{with python2} || %{with python3} pushd obj/bin/sdk/installer +export VBOX_INSTALL_PATH=%{_libdir}/virtualbox %if %{with python2} -VBOX_INSTALL_PATH=%{_libdir}/virtualbox \ %{__python2} vboxapisetup.py install --prefix %{_prefix} --root %{buildroot} %endif %if %{with python3} -VBOX_INSTALL_PATH=%{_libdir}/virtualbox \ %{__python3} vboxapisetup.py install --prefix %{_prefix} --root %{buildroot} + if [ -x /usr/bin/pathfix.py ]; then + pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}${VBOX_INSTALL_PATH}/vboxshell.py + fi %endif popd %endif @@ -844,7 +845,7 @@ getent passwd vboxadd >/dev/null || \ %{_datadir}/icons/hicolor/*/apps/*.png %{_datadir}/icons/hicolor/*/mimetypes/*.png %{_datadir}/icons/hicolor/scalable/mimetypes/virtualbox.svg -%{_datadir}/mime/* +%{_datadir}/mime/packages/virtualbox.xml %{_metainfodir}/%{name}.appdata.xml %if %{with webservice} @@ -898,6 +899,10 @@ getent passwd vboxadd >/dev/null || \ %{_datadir}/%{name}-kmod-%{version} %changelog +* Thu Jul 16 2020 Sérgio Basto <sergio(a)serjux.com&gt; - 6.1.12-1 +- Update VBox to 6.1.12 +- From Debian disable cloud_net "Fix build failure due to missing upstream file" + * Sun Jun 21 2020 Sérgio Basto <sergio(a)serjux.com&gt; - 6.1.10-5 - The VirtualBox 6.1 changelog says that it supports vboximg-mount on Linux hosts diff --git a/sources b/sources index 75b262d..d6bedb4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (VirtualBox-6.1.10.tar.bz2) = 729840d669281ed3ba2936923a50410e52bcec3fcfd5b6b740d5991aa1c25c2a8f5a5a05b4e3e39ef1a271ab3431d4c4f4b3a1262703d1e281d7111f0d4e8a3b -SHA512 (UserManual.pdf) = d66ee4585586666faec4990cb24f2e9b34d4073118afd62b8d3d2d676967ed0cb86d93bee664823bf0f17d4f86f391c4b7ee4af7071cb9678aa8d20f37bf20e4 +SHA512 (VirtualBox-6.1.12.tar.bz2) = 6572bb7d1db92665512e695503a6b3c9ab2850a7844818a22dcbb7d492ae4c835a68a4d06ea922341cc6584904ee3be059def2f7ca39e61d85a09b24c5120fd6 +SHA512 (UserManual.pdf) = 0a56b510ddab1b7be4eb4908427418e8ae665cc3d27d6322c4dc51d8c3b6edf9c09ed8dc29a5c5ee4b944d186dcff512966434bfcb5da54461533e493028ffc5 diff --git a/update_vbox.sh b/update_vbox.sh index dce3364..4784e6f 100755 --- a/update_vbox.sh +++ b/update_vbox.sh @@ -1,5 +1,5 @@ -VERSION=6.1.10 -REL=4 +VERSION=6.1.12 +REL=1 RAWHIDE=33 REPOS="f32 f31 el8 el7" if [ -z "$1" ] @@ -19,6 +19,8 @@ then rpmdev-bumpspec -n $VERSION -c "Update VBox to $VERSION" VirtualBox.spec rm UserManual.pdf spectool -g VirtualBox.spec +# we need update sources files to avoid download the wrong UserManual.pdf +rfpkg new-sources ./VirtualBox-$VERSION.tar.bz2 ./UserManual.pdf fi rfpkg srpm && copr-cli build sergiomb/vboxfor23 VirtualBox-$VERSION-$REL.fc$RAWHIDE.src.rpm fi @@ -29,7 +31,6 @@ echo STAGE 1 if test $REL -eq 1 then echo Press enter to upload sources; read dummy; -rfpkg new-sources ./VirtualBox-$VERSION.tar.bz2 ./UserManual.pdf rfpkg ci -c && git show fi echo Press enter to push and build on rawhide; read dummy; diff --git a/vboxservice.service b/vboxservice.service index 34a9e5e..0f1a0b4 100644 --- a/vboxservice.service +++ b/vboxservice.service @@ -7,6 +7,7 @@ ConditionVirtualization=|oracle [Service] Type=simple ExecStartPre=-/usr/sbin/modprobe vboxguest +ExecStartPre=-/usr/sbin/modprobe vboxsf ExecStart=/usr/sbin/VBoxService -f Restart=on-failure