rpms/bochs/FC-6 bochs-CVE-2007-2894.patch, NONE, 1.1 bochs.spec, 1.24, 1.25

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/bochs/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21128

Modified Files:
	bochs.spec 
Added Files:
	bochs-CVE-2007-2894.patch 
Log Message:
* Wed Aug 22 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3-7
- Fix CVE-2007-2894 (really fix bz 241799)


bochs-CVE-2007-2894.patch:

--- NEW FILE bochs-CVE-2007-2894.patch ---
--- bochs-2.3/iodev/floppy.cc	2007/04/06 15:22:17	1.106
+++ bochs-2.3/iodev/floppy.cc	2007/08/21 14:18:16	1.107
@@ -1785,7 +1785,7 @@
         }
         media->sectors = media->heads * media->tracks * media->sectors_per_track;
     }
-    return(1); // success
+    return (media->sectors > 0); // success
   }
 
   else if ( S_ISCHR(stat_buf.st_mode)
@@ -1805,7 +1805,7 @@
       media->heads             = floppy_type[type_idx].hd;
       media->sectors_per_track = floppy_type[type_idx].spt;
       media->sectors           = floppy_type[type_idx].sectors;
-      return 1;
+      return (media->sectors > 0);
     }
     media->tracks            = floppy_geom.track;
     media->heads             = floppy_geom.head;
@@ -1822,7 +1822,7 @@
     media->sectors_per_track = floppy_type[type_idx].spt;
     media->sectors           = floppy_type[type_idx].sectors;
 #endif
-    return 1; // success
+    return (media->sectors > 0); // success
   } else {
     // unknown file type
     BX_ERROR(("unknown mode type"));


Index: bochs.spec
===================================================================
RCS file: /cvs/extras/rpms/bochs/FC-6/bochs.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- bochs.spec	19 Jul 2007 17:21:12 -0000	1.24
+++ bochs.spec	22 Aug 2007 07:58:04 -0000	1.25
@@ -1,15 +1,16 @@
 Name:           bochs
 Version:        2.3
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        Portable x86 PC emulator
 Group:          Applications/Emulators
-License:        LGPL
+License:        LGPLv2+
 URL:            http://bochs.sourceforge.net/
 Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
 Source1:        http://bochs.sourceforge.net/guestos/dlxlinux4.tar.gz
 Patch0:         %{name}-nonet-build.patch
 Patch1:         %{name}-config.patch
 Patch2:         %{name}-CVE-2007-2893.patch
+Patch3:         %{name}-CVE-2007-2894.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  docbook-utils
 BuildRequires:  libXt-devel
@@ -65,7 +66,8 @@
 %prep
 %setup -q
 %patch0 -p0 -z .nonet
-%patch2 -p1 -z .cve
+%patch2 -p1 -z .cve-2007-2893
+%patch3 -p1 -z .cve-2007-2894
 cp -p %{SOURCE1} .
 # Fix up some man page paths.
 sed -i \
@@ -82,6 +84,8 @@
 %endif
 # Note: the CPU level, MMX et al affect what the emulator will emulate, they
 # are not properties of the build target architecture.
+# Note2: passing --enable-pcidev will change bochs license from LGPLv2+ to
+# LGPLv2 (and requires a kernel driver to be usefull)
 CONFIGURE_FLAGS=" \
   --enable-plugins \
   --enable-ne2000 \
@@ -162,6 +166,12 @@
 
 
 %changelog
+* Wed Aug 22 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3-7
+- Fix CVE-2007-2894 (really fix bz 241799)
+
+* Sun Aug  5 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3-6
+- Update License tag for new Licensing Guidelines compliance
+
 * Wed Jul 18 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3-5
 - Fix CVE-2007-2893 (bz 241799)