Hello community, here is the log from the commit of package dosemu for openSUSE:Factory checked in at 2012-03-13 09:32:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dosemu (Old) and /work/SRC/openSUSE:Factory/.dosemu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dosemu", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/dosemu/dosemu.changes 2011-09-23 01:55:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dosemu.new/dosemu.changes 2012-03-13 09:33:09.000000000 +0100 @@ -1,0 +2,11 @@ +Mon Mar 12 10:37:07 UTC 2012 - [email protected] + +- updated to 1.4.0.1 current SVN state (r2065) + +------------------------------------------------------------------- +Sat Mar 10 17:41:39 UTC 2012 - [email protected] + +- force vm86 emulation mode as we have mmap_min_addr >0 and + use of the vm86 syscall will not work. bnc#742752 + +------------------------------------------------------------------- Old: ---- dosemu-1.4.0-open.diff dosemu-1.4.0-sizeof.diff dosemu-1.4.0.1.diff dosemu-1.4.0.tgz New: ---- dosemu-1.4.0.1.r2065.tgz force-vm86-emu.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dosemu.spec ++++++ --- /var/tmp/diff_new_pack.83nsBy/_old 2012-03-13 09:33:13.000000000 +0100 +++ /var/tmp/diff_new_pack.83nsBy/_new 2012-03-13 09:33:13.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package dosemu # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,19 +18,24 @@ Name: dosemu -BuildRequires: SDL-devel bin86 bison flex freetype2 gpm-devel libsndfile-devel slang-devel xorg-x11 xorg-x11-devel +BuildRequires: SDL-devel bin86 bison flex freetype2 libsndfile-devel slang-devel xorg-x11 xorg-x11-devel + +%if 0%{?suse_version}>1130 +BuildRequires: gpm-devel +%else +BuildRequires: gpm +%endif + ExclusiveArch: %ix86 x86_64 License: GPL-2.0+ Group: System/Emulators/PC -Version: 1.4.0.1 +Version: 1.4.0.1.r2065 Release: 70 Summary: The DOS Emulator -Source: dosemu-1.4.0.tgz +Source: %name-%version.tgz Source1: dosemu-freedos-bin.tgz -Patch: dosemu-1.4.0.1.diff -Patch1: dosemu-1.4.0-open.diff Patch2: dosemu-1.4.0-destbufferoverflow.patch -Patch3: dosemu-1.4.0-sizeof.diff +Patch4: force-vm86-emu.patch Url: http://www.dosemu.org BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -73,11 +78,9 @@ users. %prep -%setup -q -n dosemu-1.4.0 -%patch -p1 -%patch1 +%setup -q -n %name-1.4.0.1 %patch2 -%patch3 +%patch4 -p1 %build %configure --sysconfdir=%{_sysconfdir}/%{name} --with-docdir=%{_docdir}/dosemu \ ++++++ force-vm86-emu.patch ++++++ Description: in the face of mmap_min_addr>0, force _cpu_emu to "vm86". Author: Kees Cook <[email protected]> Index: dosemu-1.4.0+svn.2008/etc/dosemu.conf =================================================================== --- dosemu-1.4.0+svn.2008.orig/etc/dosemu.conf 2011-05-07 05:49:14.108699827 -0700 +++ dosemu-1.4.0+svn.2008/etc/dosemu.conf 2011-05-07 05:49:55.979273762 -0700 @@ -34,11 +34,11 @@ # $_cpu = "80586" -# Usage of cpu emulation: "off" (default on x86), -# "vm86" only (default on x86-64) or "full" (vm86 and DPMI, experimental!). +# Usage of cpu emulation: "off" (requires /proc/sys/vm/mmap_min_addr= 0), +# "vm86" only (default) or "full" (vm86 and DPMI, experimental!). # Use "vm86sim" or "fullsim" to use simulation instead of JIT code generation. -# $_cpu_emu = "off" +# $_cpu_emu = "vm86" # if possible use Pentium cycle counter for timing. Default: off Index: dosemu-1.4.0+svn.2008/etc/global.conf =================================================================== --- dosemu-1.4.0+svn.2008.orig/etc/global.conf 2011-05-07 06:00:12.607700020 -0700 +++ dosemu-1.4.0+svn.2008/etc/global.conf 2011-05-07 06:00:27.767906604 -0700 @@ -220,7 +220,7 @@ $xxx = "cpuemu ", $_cpu_emu; $$xxx else - cpuemu off + cpuemu vm86 endif xms 0 $_pm_dos_api = $_ems; # disabling EMS disables also the translator -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
