From 34bd35905cda215e1dafd4042cdac78f4b520b95 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 17:54:50 +0100 Subject: [PATCH] variable escaping fix after previuos release change [release 6.1.12-3mamba;Sat Jul 25 2020] --- VBox.png | Bin 0 -> 1136 bytes VirtualBox-6.0.14-vbox-cpuhotplug-build.patch | 73 +++++ VirtualBox-6.1.10-vboxweb-gsoap.patch | 13 + VirtualBox.spec | 252 ++++++++++-------- 4 files changed, 233 insertions(+), 105 deletions(-) create mode 100644 VBox.png create mode 100644 VirtualBox-6.0.14-vbox-cpuhotplug-build.patch create mode 100644 VirtualBox-6.1.10-vboxweb-gsoap.patch diff --git a/VBox.png b/VBox.png new file mode 100644 index 0000000000000000000000000000000000000000..79fbb7d2ec1d822c039390ad34758838611de60e GIT binary patch literal 1136 zcmV-$1dscPP)lHmXV1N})v zK~z}7#h1@(9Ay~CKQq~6k|?`cO}k0T#?n?)ilw3vy4|AHOFdPv6pDxkuW3b4T0D60 zQ1GUx2OPUnG>MIxn(St?zh~ap!!wiJS!a_C-NhGPW}f%g z^E}_@JJ0)!p|$4!Y#{*S{Bj3y33v^NwOHo@@Fj2&D1`vf`lE2SdH&+75#mo;n3hQy z&~CrqrZtp-rJQ2)W-)eoB>he)Td??i-;ig(*`ZTmol>gt0Ky&uWNk=gD+{0bs=11%PPu$2JJT?|pO4#KZpimlA)k3Yd?gJ0Nn~(d)j_r{iw7&LSPuV5{GTS%;FZRO0h~MKxFTC8} z00NpC1hgPfZNPR2Bzk3CA}aEMFhslI*&bn5T?Di%>skbK;|N4TaQIQzfIipzsK}-P zN2A*yplT6t)Q&=MG%AX6HVp0o%YY+2A_KfK&_D=Wogt5e9z0%~e!cQOG7IldROCdz zIPmF@@ZNKR!eA7}7U1AR^4?)U(FsV)bxEiIC-@sq^n>ZnTR^-IZu|`+GqUyE5wP0e z%5C^=QQnXDx#u}G=LUvAsp>HRo*tGyd;=nuc%_v*BNikVA(a#mQF9rfiDbz zp&=22`4s$qPv*aIJsz8@>`5*NO7Z?+1gJtFWqvH4a)P|Isg18*M$$B{QUx?3w4T<8V-cE z%mdy{wj>8eI^{Wi*S|J7>sL}%5dXqIcJo|t9`I*E6`Y8aBd`KY%!}N}ZP|Dx)QZ~T zxHgwx{mq4ccKdr`%iGZV0CX)0b^QXt9Tr7_4B z@3TSK=EJjBGq1cip^300000 URL: http://www.virtualbox.org/ +# 6.1.12: real source is 6.1.12a Source0: http://download.virtualbox.org/virtualbox/%{version}/VirtualBox-%{version}.tar.bz2 Source1: %{name}-wrapper Source2: %{name}-initscript @@ -33,6 +34,7 @@ Source4: http://download.virtualbox.org/virtualbox/%{version}/VBoxGuestAdd Source5: %{name}-modprobe # git clone https://github.com/Thorsten-Sick/vdfuse.git Source6: vdfuse-20140417git.tar.xz +Source7: VBox.png Patch0: %{name}-4.0.8-enable_ffmpeg_capture.patch Patch1: %{name}-4.1.8-x86_64-disable_check_32bit.patch Patch2: VirtualBox-4.3.12-gcc-4.9.patch @@ -44,19 +46,19 @@ Patch7: VirtualBox-5.1.22-build-gsoap.patch Patch8: VirtualBox-5.0.24-ogl-include-path.patch Patch9: VirtualBox-5.2.2-no-vboxvideo.patch Patch10: VirtualBox-5.2.30-x86-conflicting_type_ptrdiff_t.patch +Patch11: VirtualBox-6.0.14-vbox-cpuhotplug-build.patch +Patch12: VirtualBox-6.1.10-vboxweb-gsoap.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel +BuildRequires: ldconfig +BuildRequires: libGL-devel BuildRequires: libIDL-devel BuildRequires: libSDL-devel BuildRequires: libX11-devel -BuildRequires: libXcomposite-devel BuildRequires: libXcursor-devel -BuildRequires: libXdamage-devel BuildRequires: libXext-devel -BuildRequires: libXfixes-devel BuildRequires: libXmu-devel -BuildRequires: libXrandr-devel BuildRequires: libXt-devel BuildRequires: libcurl-devel BuildRequires: libdevmapper-devel @@ -87,6 +89,9 @@ BuildRequires: latex-font-bera BuildRequires: gsoap-devel BuildRequires: jdk BuildRequires: librtmp-devel +%ifarch x86_64 +BuildRequires: glibc-multilib-devel +%endif Provides: kernelvboxdrv Obsoletes: kernelvboxdrv Requires(post):kernelheaders @@ -139,6 +144,10 @@ Provides: xorgdrvvideo #Requires: kernelvboxvideo Requires: xorg-server >= %{xorg_ver} Requires: xorg-server <= %{xorg_ver}.255 +Provides: VirtualBox-vboxguest +Obsoletes: VirtualBox-vboxguest +Provides: kernelvboxvideo +Obsoletes: kernelvboxvideo %description -n xorg-drv-video-vboxvideo X.org video driver for VirtualBox guest machine- @@ -153,34 +162,35 @@ Requires: xorg-server <= %{xorg_ver}.255 %description -n xorg-drv-input-vboxmouse X.org mouse driver for VirtualBox guest machine. -%package vboxguest -Group: System/Kernel and Hardware -Summary: Kernel DRM driver for VirtualBox guest machines -Requires(post):dkms -Requires(post):kernelheaders -Requires(post):libelf-devel -Provides: kernelvboxvideo -Obsoletes: kernelvboxvideo +#%package vboxguest +#Group: System/Kernel and Hardware +#Summary: Kernel DRM driver for VirtualBox guest machines +#Requires(post):dkms +#Requires(post):kernelheaders +#Requires(post):libelf-devel +#Provides: kernelvboxvideo +#Obsoletes: kernelvboxvideo +# +#%description vboxguest +#Kernel DRM driver for VirtualBox guest machines. -%description vboxguest -Kernel DRM driver for VirtualBox guest machines. +%debug_package %prep %setup -q -a6 #-D -T #:<< _EOF -#%patch1 -p1 -#%patch2 -p1 -#%patch4 -p1 -#%patch3 -p1 %patch5 -p1 -#%patch6 -p2 %patch7 -p1 -#%patch8 -p1 %patch9 -p1 %ifarch %{ix86} %patch10 -p1 %endif +%patch12 -p1 + +%ifarch %{ix86} +sed -i "s|VBOX_SUPPORTED_HOST_ARCHS := amd64|VBOX_SUPPORTED_HOST_ARCHS := x86|" Config.kmk +%endif echo "\ VBOX_WITH_ORIGIN := @@ -208,6 +218,7 @@ VBOX_WITH_UPDATE_REQUEST= VBOX_GCC_OPT=%{optflags}" > LocalConfig.kmk %build +#:<< _EOF export CFLAGS="%optflags" export CXXFLAGS="%optflags" @@ -220,10 +231,8 @@ export CXXFLAGS="%optflags" --with-gcc=%{_host}-gcc \ --with-g++=%{_host}-g++ \ --enable-vnc \ -%ifnarch x86_64 - --disable-python \ -%endif %if "%{stage1}" == "1" + --disable-python \ --disable-java %endif @@ -266,28 +275,32 @@ kmk %{?_smp_mflags} CPPFLAGS="%{optflags} -fpermissive" install -d %{buildroot}%{_libdir}/%{name} cp -a out/*/release/bin/* %{buildroot}%{_libdir}/%{name}/ -#install -d %{buildroot}%{_libdir}/xorg/modules/drivers -#mv %{buildroot}%{_libdir}/%{name}/additions/vboxvideo_drv_system.so %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so -#rm -f %{buildroot}%{_libdir}/%{name}/additions/vboxvideo_drv* +##install -d %{buildroot}%{_libdir}/xorg/modules/drivers +##mv %{buildroot}%{_libdir}/%{name}/additions/vboxvideo_drv_system.so %{buildroot}%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so +##rm -f %{buildroot}%{_libdir}/%{name}/additions/vboxvideo_drv* -install -d %{buildroot}%{_libdir}/dri -mv %{buildroot}%{_libdir}/%{name}/additions/VBoxOGL.so %{buildroot}%{_libdir}/dri/vboxvideo_dri.so +#install -d %{buildroot}%{_libdir}/dri +#mv %{buildroot}%{_libdir}/%{name}/additions/VBoxOGL.so %{buildroot}%{_libdir}/dri/vboxvideo_dri.so -#install -d %{buildroot}%{_libdir}/xorg/modules/input -#mv %{buildroot}%{_libdir}/%{name}/additions/vboxmouse_drv_%{xorgdrvver}.so* %{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so -rm -f %{buildroot}%{_libdir}/%{name}/additions/vboxmouse_drv* +##install -d %{buildroot}%{_libdir}/xorg/modules/input +##mv %{buildroot}%{_libdir}/%{name}/additions/vboxmouse_drv_%{xorgdrvver}.so* %{buildroot}%{_libdir}/xorg/modules/input/vboxmouse_drv.so +#rm -f %{buildroot}%{_libdir}/%{name}/additions/vboxmouse_drv* # install desktop menu icon install -d %{buildroot}%{_datadir}/pixmaps/ +%ifarch x86_64 cp %{buildroot}%{_libdir}/%{name}/VBox.png %{buildroot}%{_datadir}/pixmaps/VBox.png +%else +cp %{SOURCE7} %{buildroot}%{_datadir}/pixmaps/VBox.png +%endif ## install modprobe file #install -D -m 644 %{S:5} %{buildroot}%{_sysconfdir}/modprobe.d/vboxdrv.conf -# fixup strange shared library permissions -for library in $(find %{buildroot}%{_libdir}/%{name} -name \*.so); do - chmod 755 $library -done +## fixup strange shared library permissions +#for library in $(find %{buildroot}%{_libdir}/%{name} -name \*.so); do +# chmod 755 $library +#done # install wrappers install -d %{buildroot}%{_sysconfdir}/vbox @@ -310,6 +323,7 @@ install -D -m0755 src/VBox/Installer/linux/vboxweb-service.sh %{buildroot}%{_ini #install -D -m0755 src/VBox/Installer/linux/vboxballoonctrl-service.sh.in %{buildroot}%{_initrddir}/vboxballoon-service # install udev rules +%ifarch x86_64 install -d %{buildroot}/lib/udev/rules.d/ cat > %{buildroot}/lib/udev/rules.d/59-vboxdrv.rules << EOF KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" @@ -324,6 +338,7 @@ EOF install -d -m0755 %{buildroot}/lib/udev/ mv %{buildroot}%{_libdir}/VirtualBox/VBoxCreateUSBNode.sh \ %{buildroot}/lib/udev/VBoxCreateUSBNode.sh +%endif # install icons for size in 16 32 48 64; do @@ -347,7 +362,7 @@ rm -rf %{buildroot}%{_libdir}/%{name}/VBoxPython2_4.so rm -rf %{buildroot}%{_libdir}/%{name}/VBoxPython2_6.so # install additions -mv %{buildroot}%{_libdir}/%{name}/additions/VBoxOGL*.so %{buildroot}%{_libdir}/ +#mv %{buildroot}%{_libdir}/%{name}/additions/VBoxOGL*.so %{buildroot}%{_libdir}/ cp src/VBox/Additions/linux/installer/vboxadd-service.sh %{buildroot}%{_initrddir}/vboxadd install -d -m 0755 %{buildroot}%{_sbindir} mv %{buildroot}%{_libdir}/%{name}/additions/{VBoxService,VBoxClient,VBoxControl} %{buildroot}%{_sbindir}/ @@ -363,37 +378,43 @@ cat > %{buildroot}%{_sysconfdir}/default/virtualbox << _EOF VBOXWEB_USER=root _EOF -#make -C out/linux.%virtualbox_arch/release/bin/src/ \ -# KERN_DIR=%{_prefix}/src/linux-%{kernel_version}%{?KERNEL_TARGET} -#make -C out/linux.%virtualbox_arch/release/bin/additions/src/vboxvideo \ -# KERN_DIR=%{_prefix}/src/linux-%{kernel_version}%{?KERNEL_TARGET} -#make -C out/linux.%virtualbox_arch/release/bin/additions/src/vboxguest \ -# KERN_DIR=%{_prefix}/src/linux-%{kernel_version}%{?KERNEL_TARGET} -#/lib/modules/%{KERNEL_VER}%{KERNEL_TARGET}/kernel/drivers/virtualbox/vboxdrv.ko -#/lib/modules/%{KERNEL_VER}%{KERNEL_TARGET}/kernel/drivers/virtualbox/vboxnetadp.ko -#/lib/modules/%{KERNEL_VER}%{KERNEL_TARGET}/kernel/drivers/virtualbox/vboxnetflt.ko -#/lib/modules/%{KERNEL_VER}%{KERNEL_TARGET}/kernel/drivers/virtualbox/vboxpci.ko - # dkms -for p in vboxdrv vboxnetadp vboxnetflt vboxpci; do +for p in vboxdrv vboxnetadp vboxnetflt; do install -d -m0755 %{buildroot}%{_prefix}/src/${p}-%{version} cp -a out/linux.%virtualbox_arch/release/bin/src/${p}/* %{buildroot}%{_prefix}/src/${p}-%{version}/ done -# dkms for vboxvideo -install -d -m0755 %{buildroot}%{_prefix}/src/vboxvideo-%{version} -cp -a out/linux.%virtualbox_arch/release/bin/additions/src/vboxvideo/* %{buildroot}%{_prefix}/src/vboxvideo-%{version}/ +## dkms for vboxvideo +#install -d -m0755 %{buildroot}%{_prefix}/src/vboxvideo-%{version} +#cp -a out/linux.%virtualbox_arch/release/bin/additions/src/vboxvideo/* %{buildroot}%{_prefix}/src/vboxvideo-%{version}/ -# dkms for vboxguest -install -d -m0755 %{buildroot}%{_prefix}/src/vboxguest-%{version} -cp -a out/linux.%virtualbox_arch/release/bin/additions/src/vboxguest/* %{buildroot}%{_prefix}/src/vboxguest-%{version}/ +## dkms for vboxguest +#install -d -m0755 %{buildroot}%{_prefix}/src/vboxguest-%{version} +#cp -a out/linux.%virtualbox_arch/release/bin/additions/src/vboxguest/* %{buildroot}%{_prefix}/src/vboxguest-%{version}/ + +for p in vboxdrv; do -for p in vboxdrv vboxnetadp vboxnetflt vboxpci vboxvideo vboxguest; do cat > %{buildroot}%{_prefix}/src/${p}-%{version}/dkms.conf << _EOF PACKAGE_NAME=${p} PACKAGE_VERSION=%{version} -MAKE="make -C \${kernel_source_dir} SUBDIRS=\${dkms_tree}/\${PACKAGE_NAME}/\${PACKAGE_VERSION}/build modules" -CLEAN="make -C \${kernel_source_dir} SUBDIRS=\${dkms_tree}/\${PACKAGE_NAME}/\${PACKAGE_VERSION}/build clean" +MAKE="make -C \${kernel_source_dir} M=\${dkms_tree}/\${PACKAGE_NAME}/\${PACKAGE_VERSION}/build modules && cp \${dkms_tree}/\${PACKAGE_NAME}/\${PACKAGE_VERSION}/build/Module.symvers \${dkms_tree}/\${PACKAGE_NAME}/\${PACKAGE_VERSION}/" +CLEAN="make -C \${kernel_source_dir} M=\${dkms_tree}/\${PACKAGE_NAME}/\${PACKAGE_VERSION}/build clean" +BUILT_MODULE_NAME=${p} +BUILT_MODULE_LOCATION=./ +DEST_MODULE_LOCATION=/kernel/drivers/virtualbox +REMAKE_INITRD=no +AUTOINSTALL=yes +_EOF + +done + +for p in vboxnetadp vboxnetflt; do + +cat > %{buildroot}%{_prefix}/src/${p}-%{version}/dkms.conf << _EOF +PACKAGE_NAME=${p} +PACKAGE_VERSION=%{version} +MAKE="make -C \${kernel_source_dir} M=\${dkms_tree}/\${PACKAGE_NAME}/\${PACKAGE_VERSION}/build KBUILD_EXTRA_SYMBOLS=\${dkms_tree}/vboxdrv/\${PACKAGE_VERSION}/Module.symvers modules" +CLEAN="make -C \${kernel_source_dir} M=\${dkms_tree}/\${PACKAGE_NAME}/\${PACKAGE_VERSION}/build clean" BUILT_MODULE_NAME=${p} BUILT_MODULE_LOCATION=./ DEST_MODULE_LOCATION=/kernel/drivers/virtualbox @@ -409,7 +430,6 @@ cat > %{buildroot}%{_prefix}/lib/modules-load.d/virtualbox.conf << _EOF vboxdrv vboxnetflt vboxnetadp -vboxpci _EOF ## build and install vdfuse @@ -453,7 +473,7 @@ fi if [ $1 -eq 0 ]; then %{_sbindir}/groupdel vboxusers 2>/dev/null fi -for p in vboxdrv vboxnetadp vboxnetflt vboxpci; do +for p in vboxdrv vboxnetadp vboxnetflt; do dkms remove -q -m ${p} -v %{version} --all done : @@ -467,7 +487,7 @@ done %posttrans if [ $1 -ge 1 ]; then - for p in vboxdrv vboxnetadp vboxnetflt vboxpci; do + for p in vboxdrv vboxnetadp vboxnetflt; do dkms add -q -m ${p} -v %{version} dkms install -q -m ${p} -v %{version} --force done @@ -486,33 +506,33 @@ fi %systed_postun_with_restart wboxweb-service : -%preun vboxguest -# erase -dkms remove -q -m vboxguest -v %{version} --all -dkms remove -q -m vboxvideo -v %{version} --all -: +#%preun vboxguest +## erase +#dkms remove -q -m vboxguest -v %{version} --all +#dkms remove -q -m vboxvideo -v %{version} --all +#: -%post vboxguest -dkms remove -q -m vboxguest -v 4.2.10 --all -dkms remove -q -m vboxvideo -v 4.2.10 --all -dkms remove -q -m vboxguest -v 4.2.12 --all -dkms remove -q -m vboxvideo -v 4.2.12 --all -dkms remove -q -m vboxguest -v 4.2.14 --all -dkms remove -q -m vboxvideo -v 4.2.14 --all -dkms remove -q -m vboxguest -v 4.2.16 --all -dkms remove -q -m vboxvideo -v 4.2.16 --all -dkms remove -q -m vboxguest -v 4.2.18 --all -dkms remove -q -m vboxvideo -v 4.2.18 --all -: +#%post vboxguest +#dkms remove -q -m vboxguest -v 4.2.10 --all +#dkms remove -q -m vboxvideo -v 4.2.10 --all +#dkms remove -q -m vboxguest -v 4.2.12 --all +#dkms remove -q -m vboxvideo -v 4.2.12 --all +#dkms remove -q -m vboxguest -v 4.2.14 --all +#dkms remove -q -m vboxvideo -v 4.2.14 --all +#dkms remove -q -m vboxguest -v 4.2.16 --all +#dkms remove -q -m vboxvideo -v 4.2.16 --all +#dkms remove -q -m vboxguest -v 4.2.18 --all +#dkms remove -q -m vboxvideo -v 4.2.18 --all +#: -%posttrans vboxguest -if [ $1 -ge 1 ]; then - dkms add -q -m vboxguest -v %{version} - dkms add -q -m vboxvideo -v %{version} - dkms install -q -m vboxguest -v %{version} --force - dkms install -q -m vboxvideo -v %{version} --force -fi -: +#%posttrans vboxguest +#if [ $1 -ge 1 ]; then +# dkms add -q -m vboxguest -v %{version} +# dkms add -q -m vboxvideo -v %{version} +# dkms install -q -m vboxguest -v %{version} --force +# dkms install -q -m vboxvideo -v %{version} --force +#fi +#: %files %defattr(-,root,root) @@ -524,7 +544,7 @@ fi %{_bindir}/VBoxSDL %{_bindir}/VirtualBox %{_bindir}/vditool -/lib/udev/rules.d/59-vboxdrv.rules +%{_udevrulesdir}/59-vboxdrv.rules /lib/udev/VBoxCreateUSBNode.sh %dir %{_libdir}/%{name} %{_libdir}/%{name}/DbgPlugInDiggers.so @@ -538,11 +558,12 @@ fi %attr(4755,root,root) %{_libdir}/%{name}/VBoxNetNAT %{_libdir}/%{name}/*.sh %{_libdir}/%{name}/VBox*.so -%{_libdir}/%{name}/VMMRC.rc -%{_libdir}/%{name}/VMMRC.debug +#%{_libdir}/%{name}/VMMRC.rc +#%{_libdir}/%{name}/VMMRC.debug %{_libdir}/%{name}/VMMR0.r0 %{_libdir}/%{name}/VMMR0.debug %{_libdir}/%{name}/iPxeBaseBin +%{_libdir}/VirtualBox/bldRTLdrCheckImports %{_libdir}/VirtualBox/VBox.png %{_libdir}/VirtualBox/VBoxAutostart %{_libdir}/VirtualBox/VBoxBalloonCtrl @@ -550,10 +571,11 @@ fi %{_libdir}/VirtualBox/VBoxCpuReport %{_libdir}/VirtualBox/VBox*.debug %{_libdir}/VirtualBox/VBox*.r0 -%{_libdir}/VirtualBox/VBox*.rc +#%{_libdir}/VirtualBox/VBox*.rc %{_libdir}/VirtualBox/VBox*.fd %{_libdir}/VirtualBox/VBoxDTrace %{_libdir}/VirtualBox/VBoxExtPackHelperApp +%{_libdir}/VirtualBox/vboximg-mount %{_libdir}/VirtualBox/VBoxManage %{_libdir}/VirtualBox/VBoxManageHelp %{_libdir}/VirtualBox/VBoxSVC @@ -564,7 +586,7 @@ fi %{_libdir}/VirtualBox/VBoxXPCOMIPCD %attr(4755,root,root) %{_libdir}/VirtualBox/VirtualBoxVM %{_libdir}/VirtualBox/VirtualBoxVM.so -%{_libdir}/VirtualBox/bldRTLdrCheckImports +%{_libdir}/VirtualBox/UICommon.so %dir %{_libdir}/%{name}/components %{_libdir}/%{name}/components/VBox*.so %{_libdir}/%{name}/components/VBoxXPCOMBase.xpt @@ -574,8 +596,8 @@ fi %{_libdir}/VirtualBox/ExtensionPacks/VNC/* %dir %{_libdir}/%{name}/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack %{_libdir}/%{name}/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/* -%dir %{_libdir}/%{name}/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.*/ -%{_libdir}/%{name}/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.*/* +#%dir %{_libdir}/%{name}/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.*/ +#%{_libdir}/%{name}/ExtensionPacks/Oracle_VBoxDTrace_Extension_Pack/linux.*/* %dir %{_libdir}/%{name}/UnattendedTemplates %{_libdir}/%{name}/UnattendedTemplates/* %dir %{_libdir}/VirtualBox/dtrace @@ -609,7 +631,7 @@ fi %{_libdir}/%{name}/virtualbox.xml %{_libdir}/%{name}/xpidl %{_libdir}/%{name}/UserManual.pdf -%{_libdir}/dri/vboxvideo_dri.so +#%{_libdir}/dri/vboxvideo_dri.so %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/VBox.png @@ -620,8 +642,8 @@ fi %{_prefix}/src/vboxnetadp-%{version}/* %dir %{_prefix}/src/vboxnetflt-%{version} %{_prefix}/src/vboxnetflt-%{version}/* -%dir %{_prefix}/src/vboxpci-%{version} -%{_prefix}/src/vboxpci-%{version}/* +#%dir %{_prefix}/src/vboxpci-%{version} +#%{_prefix}/src/vboxpci-%{version}/* %doc COPYING %files devel @@ -646,8 +668,9 @@ fi %files additions %defattr(-,root,root) %{_initrddir}/vboxadd -%{_libdir}/VirtualBox/additions/VBoxEGL.so -%{_libdir}/VBoxOGL*.so +%{_libdir}/VirtualBox/additions/VBoxDRMClient +#%{_libdir}/VirtualBox/additions/VBoxEGL.so +#%{_libdir}/VBoxOGL*.so %{_sbindir}/VBoxClient %{_sbindir}/VBoxControl %{_sbindir}/VBoxService @@ -661,14 +684,33 @@ fi %defattr(-,root,root) %{_libdir}/%{name}/additions/VBoxGuestAdditions.iso -%files vboxguest -%defattr(-,root,root) -%dir %{_prefix}/src/vboxguest-%{version} -%{_prefix}/src/vboxguest-%{version}/* -%dir %{_prefix}/src/vboxvideo-%{version} -%{_prefix}/src/vboxvideo-%{version}/* +#%files vboxguest +#%defattr(-,root,root) +#%dir %{_prefix}/src/vboxguest-%{version} +#%{_prefix}/src/vboxguest-%{version}/* +#%dir %{_prefix}/src/vboxvideo-%{version} +#%{_prefix}/src/vboxvideo-%{version}/* %changelog +* Sat Jul 25 2020 Silvan Calarco 6.1.12-3mamba +- variable escaping fix after previuos release change + +* Fri Jul 24 2020 Silvan Calarco 6.1.12-2mamba +- vboxnetflt, vboxnetadp: provide and use Module.symvers from vboxdrv to fix build + +* Fri Jul 24 2020 Silvan Calarco 6.1.12-1mamba +- update to 6.1.12 +- obsolete VirtualBox-vboxguest now in kernel tree + +* Sat Jun 13 2020 Automatic Build System 6.1.10-1mamba +- automatic version update by autodist + +* Wed Dec 11 2019 Automatic Build System 6.0.14-1mamba +- automatic version update by autodist + +* Thu Jul 25 2019 Automatic Build System 6.0.10-1mamba +- automatic version update by autodist + * Thu Jul 18 2019 Silvan Calarco 6.0.8-1mamba - update to 6.0.8