[VirtualBox-kmod] Update to 7.0.14
by Sérgio M. Basto
commit 636bc8e781a45cc2a95d23f3b7cf09a5696ecaaa
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Fri Jan 19 01:11:42 2024 +0000
Update to 7.0.14
VirtualBox-kmod.spec | 7 +++++--
update_vbox.sh | 6 ++++--
2 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/VirtualBox-kmod.spec b/VirtualBox-kmod.spec
index b2eecbb..d7f681c 100644
--- a/VirtualBox-kmod.spec
+++ b/VirtualBox-kmod.spec
@@ -39,8 +39,8 @@
# https://bugzilla.rpmfusion.org/show_bug.cgi?id=6519
Name: VirtualBox-kmod
-Version: 7.0.12
-Release: 1%{?dist}.1
+Version: 7.0.14
+Release: 1%{?dist}
#Release: 1%%{?prerel:.%%{prerel}}%%{?dist}
Summary: Kernel module for VirtualBox
@@ -135,6 +135,9 @@ DIRS=$(ls %{name}-%{version} |wc -l)
[ $MODS = $DIRS ] || [ $MODS = 0 ]
%changelog
+* Fri Jan 19 2024 Sérgio Basto <sergio(a)serjux.com> - 7.0.14-1
+- Update to 7.0.14
+
* Fri Nov 24 2023 Sérgio Basto <sergio(a)serjux.com> - 7.0.12-1.1
- Rebuilt RHEL 8.9
diff --git a/update_vbox.sh b/update_vbox.sh
index f8ab5aa..c0b080b 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,7 +1,7 @@
-VERSION=7.0.12
+VERSION=7.0.14
REL=1
RAWHIDE=40
-REPOS="f39 f38 f37 el9 el8"
+REPOS="f39 f38 el9 el8"
if [ -z "$1" ]
then
@@ -17,6 +17,8 @@ if test $stage -le 0
then
echo STAGE 0
rpmdev-bumpspec -n $VERSION -c "Update to $VERSION" VirtualBox-kmod.spec
+echo "checking patches"
+rfpkg prep
echo Press enter to build on copr or n to skip; read dummy;
if [[ "$dummy" != "n" ]]; then
rfpkg copr-build sergiomb/vboxfor23
10 months, 1 week
[VirtualBox/f38] update_vbox.sh: update repos
by Sérgio M. Basto
commit 000facb4d827bccc8265892418651b5a667f7258
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Fri Jan 19 01:00:38 2024 +0000
update_vbox.sh: update repos
update_vbox.sh | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/update_vbox.sh b/update_vbox.sh
index 7adeb08..6ec4ac1 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,7 +1,7 @@
VERSION=7.0.14
REL=1
RAWHIDE=40
-REPOS="f39 f38 f37 el9 el8"
+REPOS="f39 f38 el9 el8"
if [ -z "$1" ]
then
stage=0
@@ -50,7 +50,7 @@ if test $stage -le 3
then
echo STAGE 3
echo Press enter to push and build on rawhide; read dummy;
-rfpkg push && rfpkg build --nowait
+rfpkg push && rfpkg build
fi
if test $stage -le 4
10 months, 1 week
[VirtualBox] BR: python3-setuptools to fix No module named 'distutils'
by Sérgio M. Basto
commit 35dabda59df01daf46e5770abbe8ccdb9aab57b0
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Jan 18 23:21:04 2024 +0000
BR: python3-setuptools to fix No module named 'distutils'
VirtualBox.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index 62ace55..bc39c64 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -117,6 +117,7 @@ BuildRequires: opus-devel
BuildRequires: pulseaudio-libs-devel
%if %{with python3}
BuildRequires: python%{python3_pkgversion}-devel
+BuildRequires: python%{python3_pkgversion}-setuptools
%endif
BuildRequires: desktop-file-utils
BuildRequires: libcap-devel
10 months, 1 week
[VirtualBox] Update VirtualBox to 7.0.14
by Sérgio M. Basto
commit 9af33623ddb23a3b3ddf08c75aec948a8e02f385
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Jan 18 20:46:42 2024 +0000
Update VirtualBox to 7.0.14
VirtualBox.spec | 9 ++++++++-
libxml-2.12.patch | 47 +++++++++++++++++++++++++++++++++++++++++++++++
sources | 4 ++--
update_vbox.sh | 2 +-
4 files changed, 58 insertions(+), 4 deletions(-)
---
diff --git a/VirtualBox.spec b/VirtualBox.spec
index dd743db..62ace55 100644
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -45,7 +45,7 @@
%bcond_without python3
Name: VirtualBox
-Version: 7.0.12
+Version: 7.0.14
Release: 1%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
@@ -82,6 +82,7 @@ Patch3: VirtualBox-7.0.2-default-to-Fedora.patch
Patch4: VirtualBox-5.1.0-lib64-VBox.sh.patch
#Patch27: VirtualBox-gcc.patch
Patch28: virtualbox-gcc13_cstdint.patch
+Patch30: libxml-2.12.patch
#to revert on EL7
Patch29: 590355dbdcffa4081c377fd31565e172785b390c.patch
@@ -344,6 +345,9 @@ rm -r src/libs/libtpms-0.9.*/
%if 0%{?rhel} && 0%{?rhel} < 8
%patch -P 29 -p2 -R -b .gsoap3
%endif
+%if 0%{?fedora} > 39
+%patch -P 30 -p1 -b .libxml
+%endif
%if %{with python3}
%patch -P 40 -p1 -b .python2_path
%endif
@@ -900,6 +904,9 @@ getent passwd vboxadd >/dev/null || \
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Wed Jan 17 2024 Sérgio Basto <sergio(a)serjux.com> - 7.0.14-1
+- Update VirtualBox to 7.0.14
+
* Tue Oct 17 2023 Sérgio Basto <sergio(a)serjux.com> - 7.0.12-1
- Update VirtualBox to 7.0.12
diff --git a/libxml-2.12.patch b/libxml-2.12.patch
new file mode 100644
index 0000000..4631f30
--- /dev/null
+++ b/libxml-2.12.patch
@@ -0,0 +1,47 @@
+diff --git a/include/iprt/cpp/xml.h b/include/iprt/cpp/xml.h
+index 40975e86..7639c281 100644
+--- a/include/iprt/cpp/xml.h
++++ b/include/iprt/cpp/xml.h
+@@ -113,9 +113,9 @@ public:
+ class RT_DECL_CLASS XmlError : public RuntimeError
+ {
+ public:
+- XmlError(xmlErrorPtr aErr);
++ XmlError(const xmlError *aErr);
+
+- static char* Format(xmlErrorPtr aErr);
++ static char* Format(const xmlError *aErr);
+ };
+
+ // Logical errors
+diff --git a/src/VBox/Runtime/r3/xml.cpp b/src/VBox/Runtime/r3/xml.cpp
+index a6661760..b301a6c6 100644
+--- a/src/VBox/Runtime/r3/xml.cpp
++++ b/src/VBox/Runtime/r3/xml.cpp
+@@ -131,7 +131,7 @@ LogicError::LogicError(RT_SRC_POS_DECL)
+ RTStrFree(msg);
+ }
+
+-XmlError::XmlError(xmlErrorPtr aErr)
++XmlError::XmlError(const xmlError *aErr)
+ {
+ if (!aErr)
+ throw EInvalidArg(RT_SRC_POS);
+@@ -145,7 +145,7 @@ XmlError::XmlError(xmlErrorPtr aErr)
+ * Composes a single message for the given error. The caller must free the
+ * returned string using RTStrFree() when no more necessary.
+ */
+-/* static */ char *XmlError::Format(xmlErrorPtr aErr)
++/* static */ char *XmlError::Format(const xmlError *aErr)
+ {
+ const char *msg = aErr->message ? aErr->message : "<none>";
+ size_t msgLen = strlen(msg);
+@@ -1856,7 +1856,7 @@ static void xmlParserBaseGenericError(void *pCtx, const char *pszMsg, ...) RT_NO
+ va_end(args);
+ }
+
+-static void xmlParserBaseStructuredError(void *pCtx, xmlErrorPtr error) RT_NOTHROW_DEF
++static void xmlParserBaseStructuredError(void *pCtx, const xmlError *error) RT_NOTHROW_DEF
+ {
+ NOREF(pCtx);
+ /* we expect that there is always a trailing NL */
diff --git a/sources b/sources
index 2bd2779..3599e85 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (VirtualBox-7.0.12.tar.bz2) = 9fe4511442eba788d02f932f5e98cfcc5aa4ebed41c00bd7333cf7e3f5de787e458f1f56930978283f041f403652c803143335fe9120ab63a2c113ca7b3f588f
-SHA512 (UserManual.pdf) = 8f5dc56d8ca055a79b80785abf91a9aa44338240c5839ff3a362711aa513f315c4b4e8e0f25a2a71274b335a03a264feca1c7d0b1751188d212c4e76ffea1233
+SHA512 (VirtualBox-7.0.14.tar.bz2) = 6a82933bbf51ff255d17cb61ae6ddfb791a2200e3dff705f181cd06c6031b48cf15faa5e8202a65daef0fb20b7fd9e33d40dbd0f9cc3f49af49fff04a1cb0a73
+SHA512 (UserManual.pdf) = e7f8eadb443d76a5906861c89e4a6a70f8461ba4bec1390601a76f20abccbf578c74bd6f1cb685e79b7f394e316dc79fd6d23613404a618aee296202dab4a4be
diff --git a/update_vbox.sh b/update_vbox.sh
index 90aa7f4..7adeb08 100755
--- a/update_vbox.sh
+++ b/update_vbox.sh
@@ -1,4 +1,4 @@
-VERSION=7.0.12
+VERSION=7.0.14
REL=1
RAWHIDE=40
REPOS="f39 f38 f37 el9 el8"
10 months, 1 week