rpms/bochs/devel .cvsignore, 1.9, 1.10 bochs-config.patch, 1.2, 1.3 bochs.spec, 1.26, 1.27 sources, 1.9, 1.10 bochs-CVE-2007-2893.patch, 1.1, NONE bochs-CVE-2007-2894.patch, 1.1, NONE

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/bochs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19285

Modified Files:
	.cvsignore bochs-config.patch bochs.spec sources 
Removed Files:
	bochs-CVE-2007-2893.patch bochs-CVE-2007-2894.patch 
Log Message:
* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.5-1
- New upstream release 2.3.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	27 Aug 2006 11:33:41 -0000	1.9
+++ .cvsignore	16 Sep 2007 10:39:55 -0000	1.10
@@ -1,2 +1,2 @@
-bochs-2.3.tar.gz
+bochs-2.3.5.tar.gz
 dlxlinux4.tar.gz

bochs-config.patch:

Index: bochs-config.patch
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/bochs-config.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bochs-config.patch	28 May 2005 15:36:35 -0000	1.2
+++ bochs-config.patch	16 Sep 2007 10:39:55 -0000	1.3
@@ -1,5 +1,14 @@
 --- dlxlinux/bochsrc.txt~	2005-03-27 16:29:54.000000000 +0300
 +++ dlxlinux/bochsrc.txt	2005-05-28 17:51:14.000000000 +0300
+@@ -6,7 +6,7 @@
+ megs: 32
+ 
+ # filename of ROM images
+-romimage: file=$BXSHARE/BIOS-bochs-latest, address=0xf0000
++romimage: file=$BXSHARE/BIOS-bochs-legacy, address=0xf0000
+ vgaromimage: file=$BXSHARE/VGABIOS-lgpl-latest
+ 
+ # what disk images will be used 
 @@ -27,3 +27,4 @@
  #display_library: x
 -# other choices: win32 sdl wx carbon amigaos beos macintosh nogui rfb term svga


Index: bochs.spec
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/bochs.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- bochs.spec	22 Aug 2007 07:48:53 -0000	1.26
+++ bochs.spec	16 Sep 2007 10:39:55 -0000	1.27
@@ -1,30 +1,26 @@
 Name:           bochs
-Version:        2.3
-Release:        7%{?dist}
+Version:        2.3.5
+Release:        1%{?dist}
 Summary:        Portable x86 PC emulator
 Group:          Applications/Emulators
 License:        LGPLv2+
 URL:            http://bochs.sourceforge.net/
-Source0:        http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/%{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}-wx28.patch
-Patch3:         %{name}-CVE-2007-2893.patch
-Patch4:         %{name}-CVE-2007-2894.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  docbook-utils
 BuildRequires:  libXt-devel
 BuildRequires:  libXpm-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  SDL-devel
+BuildRequires:  readline-devel
 #BuildRequires:  wxGTK-devel
 %ifarch %{ix86} x86_64
 BuildRequires:  svgalib-devel
 %endif
-%if %{with debugger}
-BuildRequires:  readline-devel
-%endif
 
 %description
 Bochs is a portable x86 PC emulation software package that emulates
@@ -68,8 +64,6 @@
 %setup -q
 %patch0 -p0 -z .nonet
 %patch2 -p1 -z .wx28
-%patch3 -p1 -z .cve-2007-2893
-%patch4 -p1 -z .cve-2007-2894
 cp -p %{SOURCE1} .
 # Fix up some man page paths.
 sed -i \
@@ -78,6 +72,9 @@
   doc/man/*.*
 # remove executable bits from sources to make rpmlint happy with the debuginfo
 chmod -x `find -name '*.cc' -o -name '*.h' -o -name '*.inc'`
+# Fix CHANGES encoding
+iconv -f ISO_8859-2 -t UTF8 CHANGES > CHANGES.tmp
+mv CHANGES.tmp CHANGES
 
 
 %build
@@ -168,6 +165,9 @@
 
 
 %changelog
+* Sun Sep 16 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 2.3.5-1
+- New upstream release 2.3.5
+
 * 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)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bochs/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	27 Aug 2006 11:33:41 -0000	1.9
+++ sources	16 Sep 2007 10:39:55 -0000	1.10
@@ -1,2 +1,2 @@
-100c02fbcd402c2b4862d0251be539fd  bochs-2.3.tar.gz
+2d9b2c1e17b4eba2d46b208be09df4a9  bochs-2.3.5.tar.gz
 379269841ae5aef95e4ec56d6d186532  dlxlinux4.tar.gz


--- bochs-CVE-2007-2893.patch DELETED ---


--- bochs-CVE-2007-2894.patch DELETED ---