Package: release.debian.org
User: release.debian....@packages.debian.org
Usertags: unblock
Severity: normal
Please unblock package virtualbox
- Added a Security.Debian.news file (or whatever is called), asked by security
team
- added a two line build fix for kernel 5.0
- dropped a non-used patch.
debdiff attached.
unblock virtualbox/6.0.4-dfsg-6
diff --git a/debian/README.Debian.security b/debian/README.Debian.security
new file mode 100644
index 000000000..f64508dca
--- /dev/null
+++ b/debian/README.Debian.security
@@ -0,0 +1,7 @@
+Virtualbox package is in contrib, and upstream refuses to give patches for
security bugs.
+Their attitude is to update to the latest version, something not feasible for
stable
+releases, specially when the minor releases of a particular major version are
not
+published anymore.
+For this reason, virtualbox might not be covered by security.debian.org
support,
+nor by stable-proposed-updates in case the maintaining is impossible due to
+lack of upstream support.
diff --git a/debian/changelog b/debian/changelog
index 99021d52c..c3f155286 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+virtualbox (6.0.4-dfsg-6) unstable; urgency=medium
+
+ * Upstream build fix with kernel 5.0 (LP: #1813071)
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org> Sat, 09 Mar 2019
13:50:34 +0100
+
virtualbox (6.0.4-dfsg-5) unstable; urgency=medium
* Tweak java patch with upstream approach
diff --git a/debian/patches/77542.patch b/debian/patches/77542.patch
new file mode 100644
index 000000000..7f97cd7da
--- /dev/null
+++ b/debian/patches/77542.patch
@@ -0,0 +1,17 @@
+Description: fix build with kernel 5.0
+Origin: upstream
+Index: virtualbox/src/VBox/Additions/linux/sharedfolders/vfsmod.c
+===================================================================
+--- virtualbox.orig/src/VBox/Additions/linux/sharedfolders/vfsmod.c
++++ virtualbox/src/VBox/Additions/linux/sharedfolders/vfsmod.c
+@@ -40,7 +40,9 @@
+ #include "revision-generated.h"
+ #include "product-generated.h"
+ #include "VBoxGuestR0LibInternal.h"
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 0, 0)
++# include <uapi/linux/mount.h> /* for MS_REMOUNT */
++#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0)
+ # include <linux/mount.h>
+ #endif
+ #include <linux/seq_file.h>
diff --git a/debian/patches/fix-backports.patch
b/debian/patches/fix-backports.patch
deleted file mode 100644
index 43d97638b..000000000
--- a/debian/patches/fix-backports.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: We should not just don't care about security issues, but this
needs fixes in gsoap(stable)
-Author: Gianfranco Costamagna <locutusofb...@debian.org>
-Last-Update: 2019-01-17
-
-Index: virtualbox/src/VBox/Main/webservice/vboxweb.cpp
-===================================================================
---- virtualbox.orig/src/VBox/Main/webservice/vboxweb.cpp
-+++ virtualbox/src/VBox/Main/webservice/vboxweb.cpp
-@@ -616,11 +616,13 @@
- // keepalive, otherwise stale connections tie up worker threads.
- m_soap->send_timeout = 60;
- m_soap->recv_timeout = 60;
-+#if GSOAP_VERSION >= 20850
- // Limit the maximum SOAP request size to a generous amount, just to
- // be on the safe side (SOAP is quite wordy when representing arrays,
- // and some API uses need to deal with large arrays). Good that binary
- // data is no longer represented by byte arrays...
- m_soap->recv_maxlength = _16M;
-+#endif
- // process the request; this goes into the COM code in methodmaps.cpp
- do {
- #ifdef WITH_OPENSSL
diff --git a/debian/patches/series b/debian/patches/series
index 71127fc9e..6f0774885 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,4 @@
do-not-run-if-not-in-vm.patch
77040.patch
java11-upstream.patch
+77542.patch
