[packages/VirtualBox] up to 6.1.2
atler
atler at pld-linux.org
Thu Jan 16 01:27:41 CET 2020
commit 7de467eabd9a2a30eb3476ed56575cad26002584
Author: Jan Palus <atler at pld-linux.org>
Date: Thu Jan 16 01:27:11 2020 +0100
up to 6.1.2
VirtualBox.spec | 9 +++---
svn_rev.patch | 86 ---------------------------------------------------------
2 files changed, 4 insertions(+), 91 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index db65cde..4291a8f 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -52,14 +52,14 @@ exit 1
Summary: VirtualBox - x86 hardware virtualizer
Summary(pl.UTF-8): VirtualBox - wirtualizator sprzętu x86
Name: %{pname}%{?_pld_builder:%{?with_kernel:-kernel}}%{_alt_kernel}
-Version: 6.1.0
+Version: 6.1.2
Release: %{rel}%{?_pld_builder:%{?with_kernel:@%{_kernel_ver_str}}}
License: GPL v2
Group: Applications/Emulators
Source0: http://download.virtualbox.org/virtualbox/%{version}/%{pname}-%{version}.tar.bz2
-# Source0-md5: 484b550f4692c9d61896b08bb0a1be7f
+# Source0-md5: f4f42fd09857556b04b803fb99cc6905
Source1: http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdditions_%{version}.iso
-# Source1-md5: 24e170ad35727712a53d191b806428f5
+# Source1-md5: 85a1ecad6dade9f22ea0b94556b96898
Source2: vboxservice.init
Source3: vboxservice.service
Source4: vboxservice.sysconfig
@@ -74,7 +74,6 @@ Source12: udev-guest.rules
Patch0: %{pname}-version-error.patch
Patch1: %{pname}-VBoxSysInfo.patch
Patch2: %{pname}-warning_workaround.patch
-Patch3: svn_rev.patch
Patch4: wrapper.patch
Patch6: hardening-shared.patch
Patch7: lightdm-greeter-makefile.patch
@@ -539,7 +538,6 @@ echo override vboxguest %{_kernel_ver} misc > PLD-MODULE-BUILD/installed/etc/dep
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p0
%patch4 -p1
%patch6 -p1
%patch7 -p1
@@ -981,6 +979,7 @@ dkms remove -m vboxhost -v %{version}-%{rel} --rpm_safe_upgrade --all || :
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTCp
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTDbgSymCache
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTEfiFatExtract
+%attr(755,root,root) %{_libdir}/%{pname}/tools/RTFTPServer
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTFuzzClient
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTFuzzMaster
%attr(755,root,root) %{_libdir}/%{pname}/tools/RTGzip
diff --git a/svn_rev.patch b/svn_rev.patch
deleted file mode 100644
index a59f6fe..0000000
--- a/svn_rev.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-------------------------------------------------------------------------
-r82582 | vboxsync | 2019-12-13 17:49:00 +0100 (pią, 13 gru 2019) | 3 lines
-
-Additions/linux/export_modules.sh: adjust to use proper svn rev fallback
-HostDrivers/linux/export_modules.sh: adjust to use proper svn rev fallback and use the setting from Config.kmk to decide whether vboxpci should be included or not
-
-
-Index: src/VBox/HostDrivers/linux/export_modules.sh
-===================================================================
---- src/VBox/HostDrivers/linux/export_modules.sh (revision 82581)
-+++ src/VBox/HostDrivers/linux/export_modules.sh (revision 82582)
-@@ -100,12 +100,26 @@
- VBOX_VERSION_MINOR=`sed -e "s/^ *VBOX_VERSION_MINOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Version.kmk`
- VBOX_VERSION_BUILD=`sed -e "s/^ *VBOX_VERSION_BUILD *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Version.kmk`
- VBOX_VERSION_STRING=$VBOX_VERSION_MAJOR.$VBOX_VERSION_MINOR.$VBOX_VERSION_BUILD
--VBOX_SVN_REV=`sed -e 's/^ *VBOX_SVN_REV_FALLBACK *:= \+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d' $PATH_ROOT/Config.kmk` VBOX_VENDOR=`sed -e 's/^ *VBOX_VENDOR *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk` VBOX_VENDOR_SHORT=`sed -e 's/^ *VBOX_VENDOR_SHORT *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk` VBOX_PRODUCT=`sed -e 's/^ *VBOX_PRODUCT *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk` VBOX_C_YEAR=`date +%Y`
-+VBOX_VERSION_BUILD=`sed -e "s/^ *VBOX_VERSION_BUILD *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Version.kmk`
-+VBOX_SVN_CONFIG_REV=`sed -e 's/^ *VBOX_SVN_REV_CONFIG_FALLBACK *:= \+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d' $PATH_ROOT/Config.kmk`
-+VBOX_SVN_VERSION_REV=`sed -e 's/^ *VBOX_SVN_REV_VERSION_FALLBACK *:= \+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d' $PATH_ROOT/Version.kmk`
-+if [ "$VBOX_SVN_CONFIG_REV" -gt "$VBOX_SVN_VERSION_REV" ]; then
-+ VBOX_SVN_REV=$VBOX_SVN_CONFIG_REV
-+else
-+ VBOX_SVN_REV=$VBOX_SVN_VERSION_REV
-+fi
-+VBOX_VENDOR=`sed -e 's/^ *VBOX_VENDOR *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk`
-+VBOX_VENDOR_SHORT=`sed -e 's/^ *VBOX_VENDOR_SHORT *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk`
-+VBOX_PRODUCT=`sed -e 's/^ *VBOX_PRODUCT *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk`
-+VBOX_C_YEAR=`date +%Y`
-+VBOX_WITH_PCI_PASSTHROUGH=`sed -e "s/^ *VBOX_WITH_PCI_PASSTHROUGH *= *\(1\?\)/\1/;t;d" $PATH_ROOT/Config.kmk`
-
- . $PATH_VBOXDRV/linux/files_vboxdrv
- . $PATH_VBOXNET/linux/files_vboxnetflt
- . $PATH_VBOXADP/linux/files_vboxnetadp
--. $PATH_VBOXPCI/linux/files_vboxpci
-+if [ "$VBOX_WITH_PCI_PASSTHROUGH" -eq "1" ]; then
-+ . $PATH_VBOXPCI/linux/files_vboxpci
-+fi
-
- # Temporary path for creating the modules, will be removed later
- rm -rf "$PATH_TMP"
-@@ -187,14 +201,16 @@
- fi
-
- # vboxpci (VirtualBox host PCI access kernel module)
--mkdir $PATH_TMP/vboxpci || exit 1
--for f in $VBOX_VBOXPCI_SOURCES; do
-- install -D -m 0644 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxpci/`echo $f|cut -d'>' -f2`"
--done
--if [ -n "$VBOX_WITH_HARDENING" ]; then
-- cat $PATH_VBOXPCI/linux/Makefile > $PATH_TMP/vboxpci/Makefile
--else
-- sed -e "s;VBOX_WITH_HARDENING;;g" < $PATH_VBOXPCI/linux/Makefile > $PATH_TMP/vboxpci/Makefile
-+if [ "$VBOX_WITH_PCI_PASSTHROUGH" -eq "1" ]; then
-+ mkdir $PATH_TMP/vboxpci || exit 1
-+ for f in $VBOX_VBOXPCI_SOURCES; do
-+ install -D -m 0644 `echo $f|cut -d'=' -f1` "$PATH_TMP/vboxpci/`echo $f|cut -d'>' -f2`"
-+ done
-+ if [ -n "$VBOX_WITH_HARDENING" ]; then
-+ cat $PATH_VBOXPCI/linux/Makefile > $PATH_TMP/vboxpci/Makefile
-+ else
-+ sed -e "s;VBOX_WITH_HARDENING;;g" < $PATH_VBOXPCI/linux/Makefile > $PATH_TMP/vboxpci/Makefile
-+ fi
- fi
-
- install -D -m 0644 $PATH_LINUX/Makefile $PATH_TMP/Makefile
-Index: src/VBox/Additions/linux/export_modules.sh
-===================================================================
---- src/VBox/Additions/linux/export_modules.sh (revision 82581)
-+++ src/VBox/Additions/linux/export_modules.sh (revision 82582)
-@@ -46,7 +46,13 @@
- VBOX_VERSION_MAJOR=`sed -e "s/^ *VBOX_VERSION_MAJOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Version.kmk`
- VBOX_VERSION_MINOR=`sed -e "s/^ *VBOX_VERSION_MINOR *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Version.kmk`
- VBOX_VERSION_BUILD=`sed -e "s/^ *VBOX_VERSION_BUILD *= \+\([0-9]\+\)/\1/;t;d" $PATH_ROOT/Version.kmk`
--VBOX_SVN_REV=`sed -e 's/^ *VBOX_SVN_REV_FALLBACK *:= \+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d' $PATH_ROOT/Config.kmk`
-+VBOX_SVN_CONFIG_REV=`sed -e 's/^ *VBOX_SVN_REV_CONFIG_FALLBACK *:= \+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d' $PATH_ROOT/Config.kmk`
-+VBOX_SVN_VERSION_REV=`sed -e 's/^ *VBOX_SVN_REV_VERSION_FALLBACK *:= \+\$(patsubst *%:,, *\$Rev: *\([0-9]\+\) *\$ *) */\1/;t;d' $PATH_ROOT/Version.kmk`
-+if [ "$VBOX_SVN_CONFIG_REV" -gt "$VBOX_SVN_VERSION_REV" ]; then
-+ VBOX_SVN_REV=$VBOX_SVN_CONFIG_REV
-+else
-+ VBOX_SVN_REV=$VBOX_SVN_VERSION_REV
-+fi
- VBOX_VENDOR=`sed -e 's/^ *VBOX_VENDOR *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk`
- VBOX_VENDOR_SHORT=`sed -e 's/^ *VBOX_VENDOR_SHORT *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk`
- VBOX_PRODUCT=`sed -e 's/^ *VBOX_PRODUCT *= \+\(.\+\)/\1/;t;d' $PATH_ROOT/Config.kmk`
-
-------------------------------------------------------------------------
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/VirtualBox.git/commitdiff/7de467eabd9a2a30eb3476ed56575cad26002584
More information about the pld-cvs-commit
mailing list