diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 01:47:11 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 01:47:11 +0000 |
| commit | 063512a3792814ea25c65ae7e85c87e76d0aba21 (patch) | |
| tree | ff90c086a35f35109e4180e5970281ecb8060f55 /debian/patches | |
| parent | Merging upstream version 7.0.18-dfsg. (diff) | |
| download | virtualbox-063512a3792814ea25c65ae7e85c87e76d0aba21.tar.xz virtualbox-063512a3792814ea25c65ae7e85c87e76d0aba21.zip | |
Merging debian version 7.0.18-dfsg-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/162843.patch | 11 | ||||
| -rw-r--r-- | debian/patches/36-fix-vnc-version-string.patch | 2 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 1 insertions, 13 deletions
diff --git a/debian/patches/162843.patch b/debian/patches/162843.patch deleted file mode 100644 index 6652320d..00000000 --- a/debian/patches/162843.patch +++ /dev/null @@ -1,11 +0,0 @@ -Index: /branches/VBox-7.0/src/VBox/Devices/Network/SrvIntNetR0.cpp -=================================================================== ---- a/src/VBox/Devices/Network/SrvIntNetR0.cpp (revision 162842) -+++ b/src/VBox/Devices/Network/SrvIntNetR0.cpp (revision 162843) -@@ -2936,5 +2936,5 @@ - union - { -- uint8_t abBuf[sizeof(INTNETSG) + sizeof(INTNETSEG)]; -+ uint8_t abBuf[sizeof(INTNETSG) + 2 * sizeof(INTNETSEG)]; - INTNETSG SG; - } u; diff --git a/debian/patches/36-fix-vnc-version-string.patch b/debian/patches/36-fix-vnc-version-string.patch index 694b6573..fe1a09ec 100644 --- a/debian/patches/36-fix-vnc-version-string.patch +++ b/debian/patches/36-fix-vnc-version-string.patch @@ -3,7 +3,7 @@ Index: virtualbox/Config.kmk =================================================================== --- virtualbox.orig/Config.kmk +++ virtualbox/Config.kmk -@@ -3859,6 +3859,7 @@ +@@ -3862,6 +3862,7 @@ -e 's+@VBOX_VERSION_MINOR@+$(VBOX_VERSION_MINOR)+g' \ -e 's+@VBOX_VERSION_BUILD@+$(VBOX_VERSION_BUILD)+g' \ -e 's+@VBOX_VERSION_STRING@+$(VBOX_VERSION_STRING)+g' \ diff --git a/debian/patches/series b/debian/patches/series index f13ae574..07cab078 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -14,4 +14,3 @@ 35-libvdeplug-soname.patch 36-fix-vnc-version-string.patch 37-do-not-run-if-not-in-vm.patch -162843.patch |