[VirtualBox] Update added updated strings patch.
by Vasiliy Glazov
commit 9a84a2cb78a45f54b6304e081e98f1575bb77357
Author: Vasiliy Glazov <vascom2(a)gmail.com>
Date: Wed Apr 17 12:57:40 2019 +0300
Update added updated strings patch.
VirtualBox-6.0.6-strings.patch | 109 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 109 insertions(+)
---
diff --git a/VirtualBox-6.0.6-strings.patch b/VirtualBox-6.0.6-strings.patch
new file mode 100644
index 0000000..d40542c
--- /dev/null
+++ b/VirtualBox-6.0.6-strings.patch
@@ -0,0 +1,109 @@
+diff -uNdr VirtualBox-6.0.6_orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-6.0.6_new/src/VBox/Frontends/VirtualBox/src/main.cpp
+--- VirtualBox-6.0.6_orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2019-04-16 13:16:21.000000000 +0300
++++ VirtualBox-6.0.6_new/src/VBox/Frontends/VirtualBox/src/main.cpp 2019-04-17 11:53:03.382274383 +0300
+@@ -86,10 +86,12 @@
+ );
+
+ QString g_QStrHintLinuxNoDriver = QApplication::tr(
+- "The VirtualBox Linux kernel driver is either not loaded or not set "
+- "up correctly. Please try setting it up again by executing<br/><br/>"
+- " <font color=blue>'/sbin/vboxconfig'</font><br/><br/>"
+- "as root.<br/><br/>"
++ "The VirtualBox Linux kernel driver (vboxdrv) is probably not loaded."
++ "You may not have kernel driver installed for kernel that is runnig, if so you may do as root:"
++ " <font color=blue>dnf install akmod-VirtualBox kernel-devel-$(uname -r)</font>"
++ "If you installed VirtualBox packages and don't want reboot the system, you may need load the "
++ "kernel driver, doing as root:"
++ " <font color=blue>akmods; systemctl restart systemd-modules-load.service</font><br/><br/>"
+ "If your system has EFI Secure Boot enabled you may also need to sign "
+ "the kernel modules (vboxdrv, vboxnetflt, vboxnetadp, vboxpci) before "
+ "you can load them. Please see your Linux system's documentation for "
+@@ -99,9 +101,12 @@
+ QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
+ "The VirtualBox kernel modules do not match this version of "
+ "VirtualBox. The installation of VirtualBox was apparently not "
+- "successful. Please try completely uninstalling and reinstalling "
+- "VirtualBox."
+- );
++ "successful. Executing<br/><br/>"
++ " <font color=blue>rmmod vboxnetadp vboxnetflt vboxpci vboxdrv; systemctl restart systemd-modules-load.service</font> as root<br/><br/>"
++ "may correct this. Make sure that you do not mix the "
++ "RPMFusion version and the Oracle version of VirtualBox."
++
++);
+
+ QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr(
+ "The VirtualBox kernel modules do not match this version of "
+@@ -116,9 +121,9 @@
+ "Make sure the kernel module has been loaded successfully."
+ );
+
+-/* I hope this isn't (C), (TM) or (R) Microsoft support ;-) */
++/* We're going to try to give a helping hand */
+ QString g_QStrHintReinstall = QApplication::tr(
+- "Please try reinstalling VirtualBox."
++ "Please report the problem to the RPM Fusion Bugzilla."
+ );
+
+
+diff -uNdr VirtualBox-6.0.6_orig/src/VBox/Installer/linux/VBox.sh VirtualBox-6.0.6_new/src/VBox/Installer/linux/VBox.sh
+--- VirtualBox-6.0.6_orig/src/VBox/Installer/linux/VBox.sh 2019-04-16 13:16:46.000000000 +0300
++++ VirtualBox-6.0.6_new/src/VBox/Installer/linux/VBox.sh 2019-04-17 11:53:03.406273504 +0300
+@@ -60,19 +60,24 @@
+ 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 try load the kernel module by executing as root
+
+- sudo /sbin/vboxconfig
++ dnf install akmod-VirtualBox kernel-devel-$(uname -r)
++ akmods --kernels $(uname -r) && systemctl restart systemd-modules-load.service
+
+ 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
++install the kernel module by executing as root
+
+- sudo /sbin/vboxconfig
++ dnf install akmod-VirtualBox kernel-devel-$(uname -r)
++ akmods --kernels $(uname -r) && systemctl restart systemd-modules-load.service
+
+- and if that is not successful, try to re-install the package.
++ and if that is not successful, try see if
++ http://rpmfusion.org/Howto/VirtualBox have any solution or contact
++ RPMFusion by Mailing Lists, IRC or Bugzilla.
+
+ You will not be able to start VMs until this problem is fixed.
+ EOF
+diff -uNdr VirtualBox-6.0.6_orig/src/VBox/VMM/VMMR3/VM.cpp VirtualBox-6.0.6_new/src/VBox/VMM/VMMR3/VM.cpp
+--- VirtualBox-6.0.6_orig/src/VBox/VMM/VMMR3/VM.cpp 2019-04-16 13:17:42.000000000 +0300
++++ VirtualBox-6.0.6_new/src/VBox/VMM/VMMR3/VM.cpp 2019-04-17 11:53:03.396273870 +0300
+@@ -342,9 +342,9 @@
+ pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module "
+ "was either not loaded, /dev/vboxdrv is not set up properly, "
+ "or you are using EFI Secure Boot and the module is not signed "
+- "in the right way for your system. If necessary, try setting up "
+- "the kernel module again by executing "
+- "'/sbin/vboxconfig' as root");
++ "in the right way for your system."
++ "Load the kernel module by executing "
++ "'systemctl restart systemd-modules-load.service' as root");
+ #else
+ pszError = N_("VirtualBox kernel driver not loaded");
+ #endif
+@@ -386,9 +386,9 @@
+ pszError = N_("VirtualBox kernel driver not Installed. The vboxdrv kernel module "
+ "was either not loaded, /dev/vboxdrv is not set up properly, "
+ "or you are using EFI Secure Boot and the module is not signed "
+- "in the right way for your system. If necessary, try setting up "
+- "the kernel module again by executing "
+- "'/sbin/vboxconfig' as root");
++ "in the right way for your system."
++ "Install the kernel module by executing 'dnf install akmod-VirtualBox kernel-devel-$(uname -r)'"
++ "and 'akmods --kernels $(uname -r) && systemctl restart systemd-modules-load.service' as root");
+ #else
+ pszError = N_("VirtualBox kernel driver not installed");
+ #endif
5 years
[VirtualBox] Update to 6.0.6.
by Vasiliy Glazov
commit 18cd6ac93e7829a75ff2b45e11fd82e4e51f3d12
Author: Vasiliy Glazov <vascom2(a)gmail.com>
Date: Wed Apr 17 12:53:28 2019 +0300
Update to 6.0.6.
.gitignore | 1 +
...AutoMount-Change-Linux-mount-code-to-use-.patch | 131 ---------------------
VirtualBox-5.1.0-strings.patch | 99 ----------------
VirtualBox.spec | 11 +-
sources | 2 +-
5 files changed, 8 insertions(+), 236 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 75232ac..8f362ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@ VirtualBox-5.0.16.tar.bz2
/UserManual.pdf
/VirtualBox-6.0.2.tar.bz2
/VirtualBox-6.0.4.tar.bz2
+/VirtualBox-6.0.6.tar.bz2
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 855e468..a74bb38 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -33,8 +33,8 @@
%endif
Name: VirtualBox
-Version: 6.0.4
-Release: 2%{?dist}
+Version: 6.0.6
+Release: 1%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -59,7 +59,7 @@ Source10: vboxweb.service
Source20: os_mageia.png
Source21: os_mageia_64.png
Patch1: VirtualBox-6.0.0-noupdate.patch
-Patch2: VirtualBox-5.1.0-strings.patch
+Patch2: VirtualBox-6.0.6-strings.patch
Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
Patch27: VirtualBox-gcc.patch
Patch29: 590355dbdcffa4081c377fd31565e172785b390c.patch
@@ -74,7 +74,6 @@ Patch50: VirtualBox-5.1.0-add-Mageia-support.patch
Patch51: VirtualBox-5.1.0-revert-VBox.sh.patch
# from Fedora
Patch60: VirtualBox-5.2.10-xclient.patch
-Patch61: 0001-VBoxServiceAutoMount-Change-Linux-mount-code-to-use-.patch
BuildRequires: kBuild >= 0.1.9998.r3093
@@ -300,7 +299,6 @@ rm -r src/libs/zlib-1.2.8/
#patch50 -p1 -b .mageia-support
%patch51 -p1 -b .revert-VBox.sh
%patch60 -p1 -b .xclient
-%patch61 -p1 -b .automount
%build
./configure --disable-kmods \
@@ -806,6 +804,9 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Wed Apr 17 2019 Vasiliy N. Glazov <vascom2(a)gmail.com> - 6.0.6-1
+- Update to 6.0.6
+
* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 6.0.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources
index 0f58cce..b2863a2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-96e53b9e75a37cc6fd2d13d9c9f6881d VirtualBox-6.0.4.tar.bz2
+1b3da9c363848c9d516e38eb61b7d1ff VirtualBox-6.0.6.tar.bz2
cc249f95c62a734b011ce0043fe7180d UserManual.pdf
5 years
[wl-kmod/f30] (3 commits) ...Add wl-kmod-015_kernel_5.1_get_ds_removed.patch
by Nicolas Viéville
Summary of changes:
4c931b9... Add patch for kernel >= 5.1.x - get_ds function removed (*)
4107111... Add patch for kernel >= 5.1.x - get_ds function removed (*)
cc87c6a... Add wl-kmod-015_kernel_5.1_get_ds_removed.patch (*)
(*) This commit already existed in another branch; no separate mail sent
5 years
[wl-kmod: 2/2] Add wl-kmod-015_kernel_5.1_get_ds_removed.patch
by Nicolas Viéville
commit cc87c6a9e0655c06bfd57d61cd608cb20ad74f50
Merge: 4107111 4c931b9
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Wed Apr 17 10:41:37 2019 +0200
Add wl-kmod-015_kernel_5.1_get_ds_removed.patch
Signed-off-by: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
---
5 years
[wl-kmod: 1/2] Add patch for kernel >= 5.1.x - get_ds function removed
by Nicolas Viéville
commit 4107111d76a9466e80abd7217679c113c84441fe
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Wed Apr 17 10:27:38 2019 +0200
Add patch for kernel >= 5.1.x - get_ds function removed
wl-kmod-015_kernel_5.1_get_ds_removed.patch | 15 +++++++++++++++
wl-kmod.spec | 7 ++++++-
2 files changed, 21 insertions(+), 1 deletion(-)
---
diff --git a/wl-kmod-015_kernel_5.1_get_ds_removed.patch b/wl-kmod-015_kernel_5.1_get_ds_removed.patch
new file mode 100644
index 0000000..39c6888
--- /dev/null
+++ b/wl-kmod-015_kernel_5.1_get_ds_removed.patch
@@ -0,0 +1,15 @@
+diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_cfg80211_hybrid.c hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c
+--- hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_cfg80211_hybrid.c 2017-07-03 11:32:04.271398000 +0200
++++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_cfg80211_hybrid.c 2019-04-14 17:35:23.565460847 +0200
+@@ -490,7 +490,11 @@
+ ifr.ifr_data = (caddr_t)&ioc;
+
+ fs = get_fs();
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
++ set_fs(KERNEL_DS);
++#else
+ set_fs(get_ds());
++#endif
+ #if defined(WL_USE_NETDEV_OPS)
+ err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+ #else
diff --git a/wl-kmod.spec b/wl-kmod.spec
index e7ac78d..b489d5d 100644
--- a/wl-kmod.spec
+++ b/wl-kmod.spec
@@ -8,7 +8,7 @@
Name: wl-kmod
Version: 6.30.223.271
-Release: 23%{?dist}
+Release: 24%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -30,6 +30,7 @@ Patch10: wl-kmod-011_kernel_4.14_new_kernel_read_function_prototype.patch
Patch11: wl-kmod-012_kernel_4.15_new_timer.patch
Patch12: wl-kmod-013_gcc8_fix_bounds_check_warnings.patch
Patch13: wl-kmod-014_kernel_read_pos_increment_fix.patch
+Patch14: wl-kmod-015_kernel_5.1_get_ds_removed.patch
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i686 x86_64
@@ -84,6 +85,7 @@ pushd %{name}-%{version}-src
%patch11 -p1 -b .kernel_4.15_new_timer
%patch12 -p1 -b .gcc8_fix_bounds_check_warnings
%patch13 -p1 -b .kernel_read_pos_increment_fix
+%patch14 -p1 -b .kernel_5.1_get_ds_removed
# Manual patching to build for RHEL - inspired by CentOS wl-kmod.spec
# Actually works for RHEL 6.x and 7.x
@@ -253,6 +255,9 @@ chmod 0755 $RPM_BUILD_ROOT%{kmodinstdir_prefix}*%{kmodinstdir_postfix}/* || :
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Apr 14 2019 Nicolas Viéville <nicolas.vieville(a)uphf.fr> - 6.30.223.271-24
+- Add patch for kernel >= 5.1.x - get_ds function removed
+
* Sat Apr 06 2019 Nicolas Viéville <nicolas.vieville(a)uphf.fr> - 6.30.223.271-23
- Rework SPEC file in order to build for RHEL 6.x and 7.x
- Rebuilt for akmods-ostree-post scriptlet
5 years
[wl-kmod] Add patch for kernel >= 5.1.x - get_ds function removed
by Nicolas Viéville
commit 4c931b97e85371f77d170ff2d973bbcc60ff5b6b
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Wed Apr 17 10:27:38 2019 +0200
Add patch for kernel >= 5.1.x - get_ds function removed
wl-kmod.spec | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/wl-kmod.spec b/wl-kmod.spec
index e7ac78d..b489d5d 100644
--- a/wl-kmod.spec
+++ b/wl-kmod.spec
@@ -8,7 +8,7 @@
Name: wl-kmod
Version: 6.30.223.271
-Release: 23%{?dist}
+Release: 24%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -30,6 +30,7 @@ Patch10: wl-kmod-011_kernel_4.14_new_kernel_read_function_prototype.patch
Patch11: wl-kmod-012_kernel_4.15_new_timer.patch
Patch12: wl-kmod-013_gcc8_fix_bounds_check_warnings.patch
Patch13: wl-kmod-014_kernel_read_pos_increment_fix.patch
+Patch14: wl-kmod-015_kernel_5.1_get_ds_removed.patch
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i686 x86_64
@@ -84,6 +85,7 @@ pushd %{name}-%{version}-src
%patch11 -p1 -b .kernel_4.15_new_timer
%patch12 -p1 -b .gcc8_fix_bounds_check_warnings
%patch13 -p1 -b .kernel_read_pos_increment_fix
+%patch14 -p1 -b .kernel_5.1_get_ds_removed
# Manual patching to build for RHEL - inspired by CentOS wl-kmod.spec
# Actually works for RHEL 6.x and 7.x
@@ -253,6 +255,9 @@ chmod 0755 $RPM_BUILD_ROOT%{kmodinstdir_prefix}*%{kmodinstdir_postfix}/* || :
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun Apr 14 2019 Nicolas Viéville <nicolas.vieville(a)uphf.fr> - 6.30.223.271-24
+- Add patch for kernel >= 5.1.x - get_ds function removed
+
* Sat Apr 06 2019 Nicolas Viéville <nicolas.vieville(a)uphf.fr> - 6.30.223.271-23
- Rework SPEC file in order to build for RHEL 6.x and 7.x
- Rebuilt for akmods-ostree-post scriptlet
5 years
