[chromium-freeworld/f31: 2/2] Merge branch 'master' into f31
by hellbanger
commit 9dc43987d3d8a99747310dbf90420e4673bb1859
Merge: e472355 ab303c9
Author: Akarshan Biswas <akarshanbiswas(a)fedoraproject.org>
Date: Sat Dec 21 15:10:23 2019 +0530
Merge branch 'master' into f31
chromium-freeworld.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
4 years, 11 months
[chromium-freeworld] Update to 79.0.3945.88
by hellbanger
commit ab303c9a3080030708af78806358374e47b7e091
Author: Akarshan Biswas <akarshanbiswas(a)fedoraproject.org>
Date: Sat Dec 21 15:09:40 2019 +0530
Update to 79.0.3945.88
chromium-freeworld.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec
index 2038e52..86ad3b6 100644
--- a/chromium-freeworld.spec
+++ b/chromium-freeworld.spec
@@ -69,7 +69,7 @@
%global ozone 0
##############################Package Definitions######################################
Name: chromium-freeworld
-Version: 79.0.3945.79
+Version: 79.0.3945.88
Release: 1%{?dist}
Summary: Chromium-freeworld is an open-source web browser, powered by WebKit (Blink). It comes with all freeworld codecs and video acceleration enabled.
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
@@ -756,6 +756,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda
%{chromiumdir}/swiftshader/libGLESv2.so
#########################################changelogs#################################################
%changelog
+* Sat Dec 21 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org> - 79.0.3945.88-1
+- Update to 79.0.3945.88
+
* Fri Dec 13 2019 Akarshan Biswas <akarshanbiswas(a)fedoraproject.org> - 79.0.3945.79-1
- Update to 79.0.3945.79
diff --git a/sources b/sources
index fa8bb3a..4ee367d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (chromium-79.0.3945.79.tar.xz) = 783473ea68f26656a86c6a9e726fcc6331d80860d6bb9e5ece6d71c120c3e80fc97ef867c720fe14121b3ba4599452bc40610e56900b2ffd813b9c4f415d644d
+SHA512 (chromium-79.0.3945.88.tar.xz) = 6474da7225beb9c99c01dc234b820924dd2fb3d736f53abbac02556f3bec43acd09aa02224666c4a735417500d10f57265ab130c29cce27124e5a69463cf5e0d
4 years, 11 months
[VirtualBox-kmod] Update to 6.1.0
by Sérgio M. Basto
commit 2b33c770793eb8ddb9fe397c160e8deb873a51b2
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Fri Dec 20 22:28:23 2019 +0000
Update to 6.1.0
.gitignore | 1 +
VirtualBox-kmod.spec | 19 +++-----
fixes_for_5.4-rc3.patch | 66 ----------------------------
fixes_for_5.4.patch | 114 ------------------------------------------------
kernel-5.patch | 12 -----
sources | 2 +-
6 files changed, 8 insertions(+), 206 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cd0efc4..3b61433 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
/8dd4b8b.zip
/87b9015.zip
/83b9657.zip
+/5aba938.tar.gz
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index 164ac31..0725446 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -11,7 +11,7 @@
# newvboxsf
# globals for https://github.com/jwrdegoede/vboxsf/archive/fb360320b7d5c2dc74cb958c9b27...
-%global commit1 83b9657878a229c83e4ce652af809bdc18a3a327
+%global commit1 5aba938bcabd978e4615186ad7d8617d633e6f30
%global shortcommit1 %(c=%{commit1}; echo ${c:0:7})
# Allow only root to access vboxdrv regardless of the file mode
@@ -49,15 +49,12 @@ Release: 1%{?dist}
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
Summary: Kernel module for VirtualBox
-Group: System Environment/Kernel
License: GPLv2 or CDDL
URL: http://www.virtualbox.org/wiki/VirtualBox
# This filters out the XEN kernel, since we don't run on XEN
Source1: excludekernel-filter.txt
-Source2: https://github.com/jwrdegoede/vboxsf/archive/%{shortcommit1}.zip
+Source2: https://github.com/jwrdegoede/vboxsf/archive/%{shortcommit1}.tar.gz
Patch2: kernel-5.patch
-Patch4: fixes_for_5.4.patch
-Patch5: fixes_for_5.4-rc3.patch
%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-kmodsrc >= %{version}%{vboxreltag}, xz, time
@@ -79,18 +76,15 @@ Kernel module for VirtualBox
%prep
-%setup -T -c
+%setup -T -c -a2
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz
pushd %{name}-%{version}
%patch2 -p1
-%patch5 -p1
%if %{with newvboxsf}
rm -rf vboxsf/
-unzip %{SOURCE2}
-mv vboxsf-%{commit1}/ vboxsf/
+mv ../vboxsf-%{commit1}/ vboxsf/
%endif
-%patch4 -p1
popd
@@ -115,15 +109,14 @@ for kernel_version in %{?kernel_versions}; do
make VBOX_USE_INSERT_PAGE=1 %{?_smp_mflags} KERN_DIR="${kernel_version##*___}" -C "${kernel_version##*___}" M="${PWD}/_kmod_build_${kernel_version%%___*}/${module}" modules
done
- # copy vboxdrv (for host) module symbols which are used by vboxpci, vboxnetflt and vboxnetadp km's:
+ # copy vboxdrv (for host) module symbols which are used by vboxnetflt and vboxnetadp km's:
cp _kmod_build_${kernel_version%%___*}/{vboxdrv/Module.symvers,vboxnetadp}
cp _kmod_build_${kernel_version%%___*}/{vboxdrv/Module.symvers,vboxnetflt}
- cp _kmod_build_${kernel_version%%___*}/{vboxdrv/Module.symvers,vboxpci}
%if ! %{with newvboxsf}
# copy vboxguest (for guest) module symbols which are used by vboxsf km:
cp _kmod_build_${kernel_version%%___*}/{vboxguest/Module.symvers,vboxsf}
%endif
- for module in vbox{netadp,netflt,sf%{?with_vboxvideo:,video},pci}; do
+ for module in vbox{netadp,netflt,sf%{?with_vboxvideo:,video}}; do
make VBOX_USE_INSERT_PAGE=1 %{?_smp_mflags} KERN_DIR="${kernel_version##*___}" -C "${kernel_version##*___}" M="${PWD}/_kmod_build_${kernel_version%%___*}/${module}" modules
done
done
diff --git a/kernel-5.patch b/kernel-5.patch
index 1950911..3bca2e6 100644
--- a/kernel-5.patch
+++ b/kernel-5.patch
@@ -46,18 +46,6 @@ diff -rup VirtualBox-kmod-6.0.8/vboxnetflt/Makefile-header.gmk VirtualBox-kmod-6
VBOX_KERN_GROKS_SUBDIRS := yes
endif
endif
-diff -rup VirtualBox-kmod-6.0.8/vboxpci/Makefile-header.gmk VirtualBox-kmod-6.0.8.new/vboxpci/Makefile-header.gmk
---- VirtualBox-kmod-6.0.8/vboxpci/Makefile-header.gmk 2019-05-13 14:33:15.000000000 +0100
-+++ VirtualBox-kmod-6.0.8.new/vboxpci/Makefile-header.gmk 2019-05-31 03:03:55.997181820 +0100
-@@ -127,7 +127,7 @@ ifeq ($(KERNELRELEASE),)
- VBOX_KERN_GROKS_EXTMOD :=
- endif
- VBOX_KERN_GROKS_SUBDIRS :=
-- ifeq ($(shell if grep '"[432]\.' $(KERN_DIR)/include/linux/version.h > /dev/null 2>&1; then echo yes; fi),yes)
-+ ifeq ($(shell if grep '"[5432]\.' $(KERN_DIR)/include/linux/version.h > /dev/null 2>&1; then echo yes; fi),yes)
- VBOX_KERN_GROKS_SUBDIRS := yes
- endif
- endif
diff -rup VirtualBox-kmod-6.0.8/vboxsf/Makefile-header.gmk VirtualBox-kmod-6.0.8.new/vboxsf/Makefile-header.gmk
--- VirtualBox-kmod-6.0.8/vboxsf/Makefile-header.gmk 2019-05-13 14:33:15.000000000 +0100
+++ VirtualBox-kmod-6.0.8.new/vboxsf/Makefile-header.gmk 2019-05-31 03:03:55.997181820 +0100
diff --git a/sources b/sources
index de39784..5e42cfa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6d069a7c82836301ac4cfa4eac1115cb 83b9657.zip
+SHA512 (5aba938.tar.gz) = 15e0decfe463e0fbff5ef61e1cc5af231fbcaf3b64f9e542969e45903026897b0dc4925e66130e745d059a80f5479021e36f79b98eddd1022ead6b7806e58ee9
4 years, 11 months
[VirtualBox-kmod] Update to 6.1.0
by Sérgio M. Basto
commit 130b402669637b49fd98d732d731b3ab00868bab
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Dec 18 18:34:47 2019 +0000
Update to 6.1.0
VirtualBox-kmod.spec | 7 +++++--
update_vbox.sh | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index bb0fcae..164ac31 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -44,8 +44,8 @@
%global __arch_install_post /usr/lib/rpm/check-rpaths /usr/lib/rpm/check-buildroot
Name: VirtualBox-kmod
-Version: 6.0.14
-Release: 2%{?dist}
+Version: 6.1.0
+Release: 1%{?dist}
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
Summary: Kernel module for VirtualBox
@@ -152,6 +152,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
%changelog
+* Wed Dec 18 2019 Sérgio Monteiro Basto <sergio(a)serjux.com> - 6.1.0-1
+- Update to 6.1.0
+
* Sun Oct 20 2019 Sérgio Basto <sergio(a)serjux.com> - 6.0.14-2
- Fix for kernel 5.4-rc3
diff --git a/update_vbox.sh b/update_vbox.sh
index 29f7bc2..88c6241 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,4 +1,4 @@
-VERSION=6.0.14
+VERSION=6.1.0
REL=1
RAWHIDE=32
4 years, 11 months
[VirtualBox] Fix build
by Sérgio M. Basto
commit e6f4c03d778c813ce9393afc097fdd12b1d45a20
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Fri Dec 20 17:27:59 2019 +0000
Fix build
VirtualBox.spec | 26 ++++++++++++++------------
1 file changed, 14 insertions(+), 12 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 212e187..c6b70d4 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -740,24 +740,26 @@ getent passwd vboxadd >/dev/null || \
%doc UserManual.pdf
%endif
%license COPYING*
+%{_bindir}/VBox
+%{_bindir}/VBoxAutostart
+%{_bindir}/vboxautostart
+%{_bindir}/VBoxBalloonCtrl
+%{_bindir}/vboxballoonctrl
+%{_bindir}/VBoxBugReport
+%{_bindir}/vboxbugreport
+%{_bindir}/VBoxDTrace
+%{_bindir}/vboxdtrace
+%{_bindir}/vboxheadless
+%{_bindir}/VBoxHeadless
%{_bindir}/VBoxManage
%{_bindir}/vboxmanage
%{_bindir}/VBoxSDL
%{_bindir}/vboxsdl
-%{_bindir}/VBox
+%{_bindir}/VBoxTunctl
%{_bindir}/VBoxVRDP
-%{_bindir}/vboxheadless
-%{_bindir}/VBoxHeadless
-%{_bindir}/VBoxDTrace
-%{_bindir}/vboxdtrace
-%{_bindir}/VBoxBugReport
-%{_bindir}/vboxbugreport
-%{_bindir}/VBoxBalloonCtrl
-%{_bindir}/vboxballoonctrl
-%{_bindir}/VBoxAutostart
-%{_bindir}/vboxautostart
+%{_bindir}/VirtualBoxVM
+%{_bindir}/virtualboxvm
%{_bindir}/vbox-img
-%{_bindir}/VBoxTunctl
%{_bindir}/rdesktop-vrdp
%dir %{_libdir}/virtualbox
%{_libdir}/virtualbox/*.[^p]*
4 years, 11 months
[qmplay2/f30] Update to 19.12.19
by Martin Gansser
Summary of changes:
6773ffc... Update to 19.12.19 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 11 months
