[Pkg-virtualbox-commits] [virtualbox] 01/01: Refresh patch

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch wheezy
in repository virtualbox.

commit d3f89d6a0ad0509f974f8dad2a3cc7d293fd9480
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Tue May 19 09:37:00 2015 +0200

    Refresh patch
---
 debian/patches/CVE-2015-3456.patch | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/patches/CVE-2015-3456.patch b/debian/patches/CVE-2015-3456.patch
index 43956ce..e20d370 100644
--- a/debian/patches/CVE-2015-3456.patch
+++ b/debian/patches/CVE-2015-3456.patch
@@ -2,7 +2,7 @@ Index: virtualbox/src/VBox/Devices/Storage/fdc.c
 ===================================================================
 --- virtualbox.orig/src/VBox/Devices/Storage/fdc.c
 +++ virtualbox/src/VBox/Devices/Storage/fdc.c
-@@ -1737,7 +1737,7 @@
+@@ -1514,7 +1514,7 @@
          FLOPPY_ERROR("controller not ready for reading\n");
          return 0;
      }
@@ -11,16 +11,16 @@ Index: virtualbox/src/VBox/Devices/Storage/fdc.c
      if (fdctrl->msr & FD_MSR_NONDMA) {
          pos %= FD_SECTOR_LEN;
          if (pos == 0) {
-@@ -1961,7 +1961,7 @@
- 
-     FLOPPY_DPRINTF("CMD:%02x SEL:%02x\n", fdctrl->fifo[0], fdctrl->fifo[1]);
+@@ -1736,7 +1736,7 @@
+ {
+     fdrive_t *cur_drv = get_cur_drv(fdctrl);
  
 -    /* XXX: should set main status register to busy */
 +    fdctrl->msr &= ~FD_MSR_RQM;
      cur_drv->head = (fdctrl->fifo[1] >> 2) & 1;
  #ifdef VBOX
      TMTimerSetMillies(fdctrl->result_timer, 1000 / 50);
-@@ -2139,22 +2139,25 @@
+@@ -1897,22 +1897,25 @@
  {
      fdrive_t *cur_drv = get_cur_drv(fdctrl);
  
@@ -54,7 +54,7 @@ Index: virtualbox/src/VBox/Devices/Storage/fdc.c
  }
  
  static void fdctrl_handle_relative_seek_out(fdctrl_t *fdctrl, int direction)
-@@ -2219,7 +2222,7 @@
+@@ -1977,7 +1980,7 @@
      { FD_CMD_CONFIGURE, 0xff, "CONFIGURE", 3, fdctrl_handle_configure },
      { FD_CMD_POWERDOWN_MODE, 0xff, "POWERDOWN MODE", 2, fdctrl_handle_powerdown_mode },
      { FD_CMD_OPTION, 0xff, "OPTION", 1, fdctrl_handle_option },
@@ -63,7 +63,7 @@ Index: virtualbox/src/VBox/Devices/Storage/fdc.c
      { FD_CMD_RELATIVE_SEEK_OUT, 0xff, "RELATIVE SEEK OUT", 2, fdctrl_handle_relative_seek_out },
      { FD_CMD_FORMAT_AND_WRITE, 0xff, "FORMAT AND WRITE", 10, fdctrl_unimplemented },
      { FD_CMD_RELATIVE_SEEK_IN, 0xff, "RELATIVE SEEK IN", 2, fdctrl_handle_relative_seek_in },
-@@ -2281,7 +2284,7 @@
+@@ -2038,7 +2041,7 @@
      }
  
      FLOPPY_DPRINTF("%s: %02x\n", __func__, value);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-virtualbox/virtualbox.git