| 1 |
lu_zero 07/09/09 11:46:42 |
| 2 |
|
| 3 |
Added: bochs-2.3-floppy.patch digest-bochs-2.3 |
| 4 |
bochs-2.3-ne2k.patch bochs-2.3-redog.patch |
| 5 |
Log: |
| 6 |
New version + sec fixes see bug #145446 and bug #188148 |
| 7 |
(Portage version: 2.1.3.7) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 app-emulation/bochs/files/bochs-2.3-floppy.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/bochs/files/bochs-2.3-floppy.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/bochs/files/bochs-2.3-floppy.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: bochs-2.3-floppy.patch |
| 16 |
=================================================================== |
| 17 |
Index: iodev/floppy.cc |
| 18 |
=================================================================== |
| 19 |
RCS file: /cvsroot/bochs/bochs/iodev/floppy.cc,v |
| 20 |
retrieving revision 1.106 |
| 21 |
retrieving revision 1.107 |
| 22 |
diff -u -p -r1.106 -r1.107 |
| 23 |
--- iodev/floppy.cc 6 Apr 2007 15:22:17 -0000 1.106 |
| 24 |
+++ iodev/floppy.cc 21 Aug 2007 14:18:16 -0000 1.107 |
| 25 |
@@ -1785,7 +1785,7 @@ bx_bool bx_floppy_ctrl_c::evaluate_media |
| 26 |
} |
| 27 |
media->sectors = media->heads * media->tracks * media->sectors_per_track; |
| 28 |
} |
| 29 |
- return(1); // success |
| 30 |
+ return (media->sectors > 0); // success |
| 31 |
} |
| 32 |
|
| 33 |
else if ( S_ISCHR(stat_buf.st_mode) |
| 34 |
@@ -1805,7 +1805,7 @@ bx_bool bx_floppy_ctrl_c::evaluate_media |
| 35 |
media->heads = floppy_type[type_idx].hd; |
| 36 |
media->sectors_per_track = floppy_type[type_idx].spt; |
| 37 |
media->sectors = floppy_type[type_idx].sectors; |
| 38 |
- return 1; |
| 39 |
+ return (media->sectors > 0); |
| 40 |
} |
| 41 |
media->tracks = floppy_geom.track; |
| 42 |
media->heads = floppy_geom.head; |
| 43 |
@@ -1822,7 +1822,7 @@ bx_bool bx_floppy_ctrl_c::evaluate_media |
| 44 |
media->sectors_per_track = floppy_type[type_idx].spt; |
| 45 |
media->sectors = floppy_type[type_idx].sectors; |
| 46 |
#endif |
| 47 |
- return 1; // success |
| 48 |
+ return (media->sectors > 0); // success |
| 49 |
} else { |
| 50 |
// unknown file type |
| 51 |
BX_ERROR(("unknown mode type")); |
| 52 |
|
| 53 |
|
| 54 |
|
| 55 |
1.1 app-emulation/bochs/files/digest-bochs-2.3 |
| 56 |
|
| 57 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/bochs/files/digest-bochs-2.3?rev=1.1&view=markup |
| 58 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/bochs/files/digest-bochs-2.3?rev=1.1&content-type=text/plain |
| 59 |
|
| 60 |
Index: digest-bochs-2.3 |
| 61 |
=================================================================== |
| 62 |
MD5 100c02fbcd402c2b4862d0251be539fd bochs-2.3.tar.gz 3812273 |
| 63 |
RMD160 545e0bf3edd0fdd073a107e835f90c65451c100e bochs-2.3.tar.gz 3812273 |
| 64 |
SHA256 fd926f3915d0619ddde8dedd02dac661f3233d77f3fc2ec7f94e1e028398497a bochs-2.3.tar.gz 3812273 |
| 65 |
MD5 21c153f5aa391395c35f0c2f660da972 dlxlinux4.tar.gz 1504868 |
| 66 |
RMD160 29fd31dd0f77edacecabd9f053206a486635e7f1 dlxlinux4.tar.gz 1504868 |
| 67 |
SHA256 68b35f850ce69f4050ed85064e15d756245d57e84ddc1d52678b0e2a97dbf73e dlxlinux4.tar.gz 1504868 |
| 68 |
|
| 69 |
|
| 70 |
|
| 71 |
1.1 app-emulation/bochs/files/bochs-2.3-ne2k.patch |
| 72 |
|
| 73 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/bochs/files/bochs-2.3-ne2k.patch?rev=1.1&view=markup |
| 74 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/bochs/files/bochs-2.3-ne2k.patch?rev=1.1&content-type=text/plain |
| 75 |
|
| 76 |
Index: bochs-2.3-ne2k.patch |
| 77 |
=================================================================== |
| 78 |
Index: iodev/ne2k.cc |
| 79 |
=================================================================== |
| 80 |
RCS file: /cvsroot/bochs/bochs/iodev/ne2k.cc,v |
| 81 |
retrieving revision 1.91 |
| 82 |
retrieving revision 1.92 |
| 83 |
diff -u -p -r1.91 -r1.92 |
| 84 |
--- iodev/ne2k.cc 3 Feb 2007 17:56:35 -0000 1.91 |
| 85 |
+++ iodev/ne2k.cc 10 Mar 2007 15:17:31 -0000 1.92 |
| 86 |
@@ -1278,8 +1278,8 @@ void bx_ne2k_c::rx_handler(void *arg, co |
| 87 |
*/ |
| 88 |
void bx_ne2k_c::rx_frame(const void *buf, unsigned io_len) |
| 89 |
{ |
| 90 |
- unsigned pages; |
| 91 |
- unsigned avail; |
| 92 |
+ int pages; |
| 93 |
+ int avail; |
| 94 |
unsigned idx; |
| 95 |
int wrapped; |
| 96 |
int nextpage; |
| 97 |
|
| 98 |
|
| 99 |
|
| 100 |
1.1 app-emulation/bochs/files/bochs-2.3-redog.patch |
| 101 |
|
| 102 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/bochs/files/bochs-2.3-redog.patch?rev=1.1&view=markup |
| 103 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/app-emulation/bochs/files/bochs-2.3-redog.patch?rev=1.1&content-type=text/plain |
| 104 |
|
| 105 |
Index: bochs-2.3-redog.patch |
| 106 |
=================================================================== |
| 107 |
--- bochs-2.3.orig/iodev/hdimage.cc 2006-09-17 02:28:23.000000000 +0300 |
| 108 |
+++ bochs-2.3/iodev/hdimage.cc 2006-09-17 02:28:53.000000000 +0300 |
| 109 |
@@ -1586,7 +1586,7 @@ |
| 110 |
sprintf (logname, "%s%s", pathname, UNDOABLE_REDOLOG_EXTENSION); |
| 111 |
} |
| 112 |
|
| 113 |
- if (redolog->open(logname,REDOLOG_SUBTYPE_UNDOABLE,size) < 0) |
| 114 |
+ if (redolog->open(logname, REDOLOG_SUBTYPE_UNDOABLE) < 0) |
| 115 |
{ |
| 116 |
if (redolog->create(logname, REDOLOG_SUBTYPE_UNDOABLE, size) < 0) |
| 117 |
{ |
| 118 |
|
| 119 |
|
| 120 |
|
| 121 |
-- |
| 122 |
gentoo-commits@g.o mailing list |
Archives