[VirtualBox] Fix for rfbz #6287 (won't launch any VM)
by Sérgio M. Basto
commit b6bd8aeb4308ae7738e241b6d377779a44d38598
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Mon Apr 25 13:32:52 2022 +0100
Fix for rfbz #6287 (won't launch any VM)
VirtualBox.spec | 7 ++++++-
ffreestanding.patch | 20 ++++++++++++++++++++
2 files changed, 26 insertions(+), 1 deletion(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index a8c32fe..97974fe 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -39,7 +39,7 @@
Name: VirtualBox
Version: 6.1.34
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
License: GPLv2 or (GPLv2 and CDDL)
@@ -92,6 +92,7 @@ Patch72: virtualbox-snpritnf-buffer-overflow.patch
Patch73: vb-6.1.16-modal-dialog-parent.patch
Patch80: VirtualBox-6.1.4-gcc10.patch
+Patch81: ffreestanding.patch
Patch88: VirtualBox-lzf.patch
Patch90: 0001-libs-xpcom-Added-support-for-running-with-Python-3.1.patch
Patch91: 0002-no_ifndef.patch
@@ -342,6 +343,7 @@ rm -r src/libs/zlib-1.2.*/
%patch72 -p1 -b .snpritnf-buffer-overflow
%patch73 -p1 -b .modal-dialog-parent
%patch80 -p1 -b .gcc10
+%patch81 -p1 -b .ffreestanding
%patch88 -p1 -b .lzf
%patch90 -p2 -b .python3.10
%patch91 -p1 -b .python3.10
@@ -901,6 +903,9 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Mon Apr 25 2022 Sérgio Basto <sergio(a)serjux.com> - 6.1.34-2
+- Fix for rfbz #6287 (won't launch any VM)
+
* Tue Apr 19 2022 Sérgio Basto <sergio(a)serjux.com> - 6.1.34-1
- Update VirtualBox to 6.1.34
- Fix rfbz #6254
diff --git a/ffreestanding.patch b/ffreestanding.patch
new file mode 100644
index 0000000..0e22aa6
--- /dev/null
+++ b/ffreestanding.patch
@@ -0,0 +1,20 @@
+diff --git a/Config.kmk b/Config.kmk
+index 3df197404..4c6bd76bb 100644
+--- a/Config.kmk
++++ b/Config.kmk
+@@ -4503,11 +4504,14 @@ ifeq ($(VBOX_LDR_FMT),elf)
+ TEMPLATE_VBoxR0_TOOL = $(VBOX_GCC_TOOL)
+ TEMPLATE_VBoxR0_CFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_C) \
+ $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \
+- $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
++ $(VBOX_GCC_fno-stack-protector) -fno-common -ffreestanding $(VBOX_GCC_fvisibility-hidden) -std=gnu99 $(VBOX_GCC_IPRT_FMT_CHECK)
+ TEMPLATE_VBoxR0_CXXFLAGS = -fno-pie -nostdinc -g $(VBOX_GCC_pipe) $(VBOX_GCC_WERR) $(VBOX_GCC_PEDANTIC_CXX) \
+ $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) -fno-strict-aliasing -fno-exceptions \
+ $(VBOX_GCC_fno-stack-protector) -fno-common $(VBOX_GCC_fvisibility-inlines-hidden) $(VBOX_GCC_fvisibility-hidden) \
+ -fno-rtti $(VBOX_GCC_IPRT_FMT_CHECK)
++ if $(VBOX_GCC_VERSION_CC) >= 40500 # 4.1.2 complains, 4.5.2 is okay, didn't check which version inbetween made it okay with g++.
++TEMPLATE_VBoxR0_CXXFLAGS += -ffreestanding
++ endif
+ TEMPLATE_VBoxR0_CFLAGS.amd64 = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables -ffreestanding
+ TEMPLATE_VBoxR0_CXXFLAGS.amd64 = -m64 -mno-red-zone -mno-sse -mno-mmx -mno-sse2 -mno-3dnow -fasynchronous-unwind-tables
+ TEMPLATE_VBoxR0_CXXFLAGS.freebsd = -ffreestanding
2 years
[rpmfusion-nonfree-appstream-data/f35] regenerate
by Ankur Sinha
commit 37b942c5d49f091118f34ae11e44ba63469a2473
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Mon Apr 25 10:49:43 2022 +0100
regenerate
rpmfusion-nonfree-appstream-data.spec | 5 ++++-
sources | 2 +-
update-appdata-rpmfusion-nonfree.sh | 18 +++++++++++-------
3 files changed, 16 insertions(+), 9 deletions(-)
---
diff --git a/rpmfusion-nonfree-appstream-data.spec b/rpmfusion-nonfree-appstream-data.spec
index 8d59d75..df2d1af 100644
--- a/rpmfusion-nonfree-appstream-data.spec
+++ b/rpmfusion-nonfree-appstream-data.spec
@@ -3,7 +3,7 @@
Name: %{reponame}-%{repoversion}-appstream-data
Version: 35
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Appstream metadata for the RPM Fusion nonfree repository
BuildArch: noarch
@@ -39,6 +39,9 @@ DESTDIR=%{buildroot} appstream-util install %{SOURCE0} %{SOURCE1}
%dir %{_datadir}/app-info/xmls
%changelog
+* Mon Apr 25 2022 Ankur Sinha <sanjay.ankur(a)gmail.com> - 35-3
+- Regenerate
+
* Mon Feb 28 2022 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 35-2
- regenerated
diff --git a/sources b/sources
index 33e8ada..7735474 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (rpmfusion-nonfree-35-icons.tar.gz) = c6da1ad664ce6a5ef16c27136f5f958cbd8489b7cc9d9e9d9bdc923192cb32781e77c63ac3aed4806bb07f3777f870c03c44ef42e25b1ba85b6b5d4cfaed21f6
+SHA512 (rpmfusion-nonfree-35-icons.tar.gz) = ba058ce9a1350c33346caa744e5d974ab3af2ad23fce15b33ef3824271cfff2519637ea3c3302e8ba5574a65de362efa3f1f9830b1f6d642811e726e40996a6f
SHA512 (rpmfusion-nonfree-35.xml.gz) = b8b2c3202a8c3b696794ed8716f2fa3f4fe43299517341eab73087f30b6587e9240244e09ff43c944d8584a33ba1218dc0106ad5735bead1ddf9c07cc26f7335
diff --git a/update-appdata-rpmfusion-nonfree.sh b/update-appdata-rpmfusion-nonfree.sh
index 1b8bd9a..1c0a87a 100755
--- a/update-appdata-rpmfusion-nonfree.sh
+++ b/update-appdata-rpmfusion-nonfree.sh
@@ -7,16 +7,17 @@ TEMPDIR="rpmfusion-nonfree"
main ()
{
- rm -rf rpmfusion-nonfree
- mkdir rpmfusion-nonfree/ -pv
- cd rpmfusion-nonfree || exit -1
+ rm -rf "$TEMPDIR"
+ mkdir "$TEMPDIR/" -pv
+ cd "$TEMPDIR" || exit -1
if [ $RELEASE -le $RAWHIDE ] && [ $RELEASE -ge $((RAWHIDE - 3)) ]; then
- if [ "$RELEASE" = "$RAWHIDE" ]; then
- RELEASE="rawhide"
+ if [ "$RELEASE" == "$RAWHIDE" ]
+ then
+ URL_DEV="rsync://download1.rpmfusion.org/rpmfusion/nonfree/fedora/development/rawh..."
+ else
+ URL_DEV="rsync://download1.rpmfusion.org/rpmfusion/nonfree/fedora/development/${RE..."
fi
-
- URL_DEV="rsync://download1.rpmfusion.org/rpmfusion/nonfree/fedora/development/${RE..."
URL_RELEASE="rsync://download1.rpmfusion.org/rpmfusion/nonfree/fedora/releases/${RELEA..."
echo "Regenerating for $RELEASE"
@@ -41,6 +42,9 @@ main ()
echo "To import new sources, run:"
echo "rfpkg new-sources ${TEMPDIR}/appstream-data/rpmfusion-nonfree-${RELEASE}-icons.tar.gz ${TEMPDIR}/appstream-data/rpmfusion-nonfree-${RELEASE}.xml.gz"
+ echo "To bump the spec:"
+ echo "rpmdev-bumpspec -c 'Regenerate' rpmfusion-nonfree-appstream-data.spec"
+
}
usage ()
2 years
[rpmfusion-nonfree-appstream-data/f36] regenerate
by Ankur Sinha
commit c4de9c080476f0329534746d67a95a2c1a8270cb
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Mon Apr 25 10:26:36 2022 +0100
regenerate
rpmfusion-nonfree-appstream-data.spec | 5 ++++-
sources | 4 ++--
update-appdata-rpmfusion-nonfree.sh | 18 +++++++++++-------
3 files changed, 17 insertions(+), 10 deletions(-)
---
diff --git a/rpmfusion-nonfree-appstream-data.spec b/rpmfusion-nonfree-appstream-data.spec
index a9d46f4..c746f26 100644
--- a/rpmfusion-nonfree-appstream-data.spec
+++ b/rpmfusion-nonfree-appstream-data.spec
@@ -3,7 +3,7 @@
Name: %{reponame}-%{repoversion}-appstream-data
Version: 36
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Appstream metadata for the RPM Fusion nonfree repository
BuildArch: noarch
@@ -39,6 +39,9 @@ DESTDIR=%{buildroot} appstream-util install %{SOURCE0} %{SOURCE1}
%dir %{_datadir}/app-info/xmls
%changelog
+* Mon Apr 25 2022 Ankur Sinha <sanjay.ankur(a)gmail.com> - 36-3
+- Regenerate
+
* Mon Feb 28 2022 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 36-2
- regenerate
diff --git a/sources b/sources
index 49360da..371ee0f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (rpmfusion-nonfree-36-icons.tar.gz) = 0a839a89fc7b0a78d71e457e2199046ab34f18dd358ca29b9a357b66c881b664ef57a5f5843637ef9c2dac06f999c63517946281598d9631a3836d210005020a
-SHA512 (rpmfusion-nonfree-36.xml.gz) = 2cec47612c4bd3f9bd720b127ff32ad949a06e88c1cdb9132e93534ec7a599f5f532056d444c9fb58d35985460a70ddf247942133b11d78284447cb10ddb8270
+SHA512 (rpmfusion-nonfree-36-icons.tar.gz) = 74632de5902b4824d8186f268902032a143384b0ff50e60956642bca5fcedf23a73056b497ef4838f498fe0b1cc9a13c8065fbe33b32e5c34e88eee803cddbac
+SHA512 (rpmfusion-nonfree-36.xml.gz) = af9631981a65f9fcc8083dcf4367fd5c471520247f7d9689269998eb911e46af5353eaef63e4873ce3838f57037e63e1cd2a4751ef0d397562b7d995316cb9c9
diff --git a/update-appdata-rpmfusion-nonfree.sh b/update-appdata-rpmfusion-nonfree.sh
index 1b8bd9a..1c0a87a 100755
--- a/update-appdata-rpmfusion-nonfree.sh
+++ b/update-appdata-rpmfusion-nonfree.sh
@@ -7,16 +7,17 @@ TEMPDIR="rpmfusion-nonfree"
main ()
{
- rm -rf rpmfusion-nonfree
- mkdir rpmfusion-nonfree/ -pv
- cd rpmfusion-nonfree || exit -1
+ rm -rf "$TEMPDIR"
+ mkdir "$TEMPDIR/" -pv
+ cd "$TEMPDIR" || exit -1
if [ $RELEASE -le $RAWHIDE ] && [ $RELEASE -ge $((RAWHIDE - 3)) ]; then
- if [ "$RELEASE" = "$RAWHIDE" ]; then
- RELEASE="rawhide"
+ if [ "$RELEASE" == "$RAWHIDE" ]
+ then
+ URL_DEV="rsync://download1.rpmfusion.org/rpmfusion/nonfree/fedora/development/rawh..."
+ else
+ URL_DEV="rsync://download1.rpmfusion.org/rpmfusion/nonfree/fedora/development/${RE..."
fi
-
- URL_DEV="rsync://download1.rpmfusion.org/rpmfusion/nonfree/fedora/development/${RE..."
URL_RELEASE="rsync://download1.rpmfusion.org/rpmfusion/nonfree/fedora/releases/${RELEA..."
echo "Regenerating for $RELEASE"
@@ -41,6 +42,9 @@ main ()
echo "To import new sources, run:"
echo "rfpkg new-sources ${TEMPDIR}/appstream-data/rpmfusion-nonfree-${RELEASE}-icons.tar.gz ${TEMPDIR}/appstream-data/rpmfusion-nonfree-${RELEASE}.xml.gz"
+ echo "To bump the spec:"
+ echo "rpmdev-bumpspec -c 'Regenerate' rpmfusion-nonfree-appstream-data.spec"
+
}
usage ()
2 years
[rpmfusion-nonfree-appstream-data] regenerate
by Ankur Sinha
commit aba33577dbcc74eaafb29854aff5cc5670f14331
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Mon Apr 25 10:18:10 2022 +0100
regenerate
rpmfusion-nonfree-appstream-data.spec | 5 ++++-
update-appdata-rpmfusion-nonfree.sh | 11 ++++++++---
2 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/rpmfusion-nonfree-appstream-data.spec b/rpmfusion-nonfree-appstream-data.spec
index cd1ec81..97ac288 100644
--- a/rpmfusion-nonfree-appstream-data.spec
+++ b/rpmfusion-nonfree-appstream-data.spec
@@ -3,7 +3,7 @@
Name: %{reponame}-%{repoversion}-appstream-data
Version: 37
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Appstream metadata for the RPM Fusion nonfree repository
BuildArch: noarch
@@ -39,6 +39,9 @@ DESTDIR=%{buildroot} appstream-util install %{SOURCE0} %{SOURCE1}
%dir %{_datadir}/app-info/xmls
%changelog
+* Mon Apr 25 2022 Ankur Sinha <sanjay.ankur(a)gmail.com> - 37-3
+- Regenerate
+
* Mon Apr 25 2022 Ankur Sinha <sanjay.ankur(a)gmail.com> - 37-2
- Regenerate
diff --git a/update-appdata-rpmfusion-nonfree.sh b/update-appdata-rpmfusion-nonfree.sh
index f61fb9e..1c0a87a 100755
--- a/update-appdata-rpmfusion-nonfree.sh
+++ b/update-appdata-rpmfusion-nonfree.sh
@@ -8,11 +8,16 @@ TEMPDIR="rpmfusion-nonfree"
main ()
{
rm -rf "$TEMPDIR"
- mkdir "$TEMPDIR"/ -pv
+ mkdir "$TEMPDIR/" -pv
cd "$TEMPDIR" || exit -1
if [ $RELEASE -le $RAWHIDE ] && [ $RELEASE -ge $((RAWHIDE - 3)) ]; then
- URL_DEV="rsync://download1.rpmfusion.org/rpmfusion/nonfree/fedora/development/rawh..."
+ if [ "$RELEASE" == "$RAWHIDE" ]
+ then
+ URL_DEV="rsync://download1.rpmfusion.org/rpmfusion/nonfree/fedora/development/rawh..."
+ else
+ URL_DEV="rsync://download1.rpmfusion.org/rpmfusion/nonfree/fedora/development/${RE..."
+ fi
URL_RELEASE="rsync://download1.rpmfusion.org/rpmfusion/nonfree/fedora/releases/${RELEA..."
echo "Regenerating for $RELEASE"
@@ -38,7 +43,7 @@ main ()
echo "rfpkg new-sources ${TEMPDIR}/appstream-data/rpmfusion-nonfree-${RELEASE}-icons.tar.gz ${TEMPDIR}/appstream-data/rpmfusion-nonfree-${RELEASE}.xml.gz"
echo "To bump the spec:"
- echo "rpmdev-bumpspec -c "Regenerate" rpmfusion-nonfree-appstream-data.spec"
+ echo "rpmdev-bumpspec -c 'Regenerate' rpmfusion-nonfree-appstream-data.spec"
}
2 years
[rpmfusion-free-appstream-data/f36] regenerate
by Ankur Sinha
commit f17f0765ea68fe34bcd93e3f68df2f323142564b
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Mon Apr 25 10:08:41 2022 +0100
regenerate
rpmfusion-free-appstream-data.spec | 5 ++++-
update-appdata-rpmfusion-free.sh | 12 ++++++++----
2 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/rpmfusion-free-appstream-data.spec b/rpmfusion-free-appstream-data.spec
index 70c5e3d..af77a43 100644
--- a/rpmfusion-free-appstream-data.spec
+++ b/rpmfusion-free-appstream-data.spec
@@ -3,7 +3,7 @@
Name: %{reponame}-%{repoversion}-appstream-data
Version: 36
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Appstream metadata for the RPM Fusion free repository
BuildArch: noarch
@@ -40,6 +40,9 @@ DESTDIR=%{buildroot} appstream-util install %{SOURCE0} %{SOURCE1}
%dir %{_datadir}/app-info/xmls
%changelog
+* Mon Apr 25 2022 Ankur Sinha <sanjay.ankur(a)gmail.com> - 36-4
+- Regenerate
+
* Mon Apr 25 2022 Ankur Sinha <sanjay.ankur(a)gmail.com> - 36-3
- Regenerate
diff --git a/update-appdata-rpmfusion-free.sh b/update-appdata-rpmfusion-free.sh
index 5385e5b..be9a18c 100755
--- a/update-appdata-rpmfusion-free.sh
+++ b/update-appdata-rpmfusion-free.sh
@@ -12,11 +12,12 @@ main ()
cd rpmfusion-free || exit -1
if [ $RELEASE -le $RAWHIDE ] && [ $RELEASE -ge $((RAWHIDE - 3)) ]; then
- if [ "$RELEASE" = "$RAWHIDE" ]; then
- RELEASE="rawhide"
+ if [ "$RELEASE" == "$RAWHIDE" ]
+ then
+ URL_DEV="rsync://download1.rpmfusion.org/rpmfusion/free/fedora/development/rawhide..."
+ else
+ URL_DEV="rsync://download1.rpmfusion.org/rpmfusion/free/fedora/development/${RELEA..."
fi
-
- URL_DEV="rsync://download1.rpmfusion.org/rpmfusion/free/fedora/development/${RELEA..."
URL_RELEASE="rsync://download1.rpmfusion.org/rpmfusion/free/fedora/releases/${RELEASE}..."
echo "Regenerating for $RELEASE"
@@ -41,6 +42,9 @@ main ()
echo "To import new sources, run:"
echo "rfpkg new-sources ${TEMPDIR}/appstream-data/rpmfusion-free-${RELEASE}-icons.tar.gz ${TEMPDIR}/appstream-data/rpmfusion-free-${RELEASE}.xml.gz"
+ echo "To bump the spec:"
+ echo "rpmdev-bumpspec -c "Regenerate" rpmfusion-free-appstream-data.spec"
+
}
usage ()
2 years
[rpmfusion-free-appstream-data] Regenerate
by Ankur Sinha
commit 9331a81f4588eddc394c7464c1e00cf3818caa0f
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com>
Date: Mon Apr 25 10:02:37 2022 +0100
Regenerate
rpmfusion-free-appstream-data.spec | 5 ++++-
update-appdata-rpmfusion-free.sh | 7 ++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/rpmfusion-free-appstream-data.spec b/rpmfusion-free-appstream-data.spec
index aca896a..3abd3b2 100644
--- a/rpmfusion-free-appstream-data.spec
+++ b/rpmfusion-free-appstream-data.spec
@@ -3,7 +3,7 @@
Name: %{reponame}-%{repoversion}-appstream-data
Version: 37
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Appstream metadata for the RPM Fusion free repository
BuildArch: noarch
@@ -40,6 +40,9 @@ DESTDIR=%{buildroot} appstream-util install %{SOURCE0} %{SOURCE1}
%dir %{_datadir}/app-info/xmls
%changelog
+* Mon Apr 25 2022 Ankur Sinha <sanjay.ankur(a)gmail.com> - 37-4
+- Regenerate
+
* Mon Apr 25 2022 Ankur Sinha <sanjay.ankur(a)gmail.com> - 37-3
- Regenerate
diff --git a/update-appdata-rpmfusion-free.sh b/update-appdata-rpmfusion-free.sh
index 94829a5..be9a18c 100755
--- a/update-appdata-rpmfusion-free.sh
+++ b/update-appdata-rpmfusion-free.sh
@@ -12,7 +12,12 @@ main ()
cd rpmfusion-free || exit -1
if [ $RELEASE -le $RAWHIDE ] && [ $RELEASE -ge $((RAWHIDE - 3)) ]; then
- URL_DEV="rsync://download1.rpmfusion.org/rpmfusion/free/fedora/development/rawhide..."
+ if [ "$RELEASE" == "$RAWHIDE" ]
+ then
+ URL_DEV="rsync://download1.rpmfusion.org/rpmfusion/free/fedora/development/rawhide..."
+ else
+ URL_DEV="rsync://download1.rpmfusion.org/rpmfusion/free/fedora/development/${RELEA..."
+ fi
URL_RELEASE="rsync://download1.rpmfusion.org/rpmfusion/free/fedora/releases/${RELEASE}..."
echo "Regenerating for $RELEASE"
2 years