Your message dated Thu, 24 Jul 2008 18:17:13 +0000
with message-id <[EMAIL PROTECTED]>
and subject line Bug#489415: fixed in v86d 0.1.5.2-1
has caused the Debian Bug report #489415,
regarding v86d: uses embedded copies of lrmi and x86emu
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [EMAIL PROTECTED]
immediately.)
--
489415: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=489415
Debian Bug Tracking System
Contact [EMAIL PROTECTED] with problems
--- Begin Message ---
Source: v86d
Version: 0.1.5-1
Severity: important
Tags: patch security
Hi,
This packages has embedded copies of lrmi and x86emu, please switch to
use libx86 instead which should use either depending on the support
from the system.
Attached a patch for this switch. I'll be sending one to upstream with
all code removals.
regards,
guillem
>From b5b7586ac82433d1690a2348e316b461dc1d8b6f Mon Sep 17 00:00:00 2001
From: Guillem Jover <[EMAIL PROTECTED]>
Date: Sat, 5 Jul 2008 17:50:58 +0300
Subject: [PATCH] Use external libx86 instead of embedded lrmi and x86emu
---
Makefile | 27 ++++-----------------------
README | 3 ---
configure | 17 -----------------
debian/control | 2 +-
debian/lintian-overrides | 2 --
debian/rules | 2 +-
v86_lrmi.c | 2 +-
7 files changed, 7 insertions(+), 48 deletions(-)
delete mode 100644 debian/lintian-overrides
diff --git a/Makefile b/Makefile
index 84da0c5..f7083dd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
config_opt = $(shell if [ -e config.h -a -n "`egrep '^\#define[[:space:]]+$(1)([[:space:]]+|$$)' config.h 2>/dev/null`" ]; then echo true ; fi)
-.PHONY: clean install install_testvbe x86emu lrmi
+.PHONY: clean install install_testvbe
INSTALL = install
KDIR ?= /lib/modules/$(shell uname -r)/source
@@ -12,19 +12,8 @@ endif
CFLAGS ?= -Wall -g -O2
CFLAGS += -I$(KDIR)/include
-ifeq ($(call config_opt,CONFIG_X86EMU),true)
- CFLAGS += -Ilibs/x86emu
- LDFLAGS += -Llibs/x86emu
- LDLIBS += -lx86emu
- V86OBJS = v86_x86emu.o v86_mem.o
- V86LIB = x86emu
-else
- CFLAGS += -Ilibs/lrmi-0.10
- LDFLAGS += -Llibs/lrmi-0.10 -static
- LDLIBS += -llrmi
- V86OBJS = v86_lrmi.o
- V86LIB = lrmi
-endif
+LDLIBS += -lx86
+V86OBJS = v86_lrmi.o
DEBUG_BUILD =
DEBUG_INSTALL =
@@ -34,7 +23,7 @@ ifeq ($(call config_opt,CONFIG_DEBUG),true)
DEBUG_INSTALL += install_testvbe
endif
-all: $(V86LIB) v86d $(DEBUG_BUILD)
+all: v86d $(DEBUG_BUILD)
%.o: %.c v86.h
$(CC) $(CFLAGS) -c -o $@ $<
@@ -45,16 +34,8 @@ v86d: v86.o v86_common.o $(V86OBJS)
testvbe: testvbe.o v86_common.o $(V86OBJS)
$(CC) $(LDFLAGS) $+ $(LDLIBS) -o $@
-x86emu:
- make -w -C libs/x86emu
-
-lrmi:
- make -e -w -C libs/lrmi-0.10 liblrmi.a
-
clean:
rm -rf *.o v86d testvbe
- $(MAKE) -w -C libs/lrmi-0.10 clean
- $(MAKE) -w -C libs/x86emu clean
distclean: clean
rm -rf config.h
diff --git a/README b/README
index 178c004..c1b02f8 100644
--- a/README
+++ b/README
@@ -38,9 +38,6 @@ software-emulated environment (x86emu) or a virtualized
environment (vm86) supported by the CPU. On other arches
or 64-bit systems, the code is always run by x86emu.
-To choose the x86emu backend on a x86 system, run ./configure
---with-x86emu.
-
4. Installation & Usage
-----------------------
To configure, build and install v86d with the default settings,
diff --git a/configure b/configure
index cbbd6b3..3a6b926 100755
--- a/configure
+++ b/configure
@@ -17,23 +17,6 @@ copt_debug_desc="Use additional debugging features"
copt_debug_type="bool"
copt_debug_def=n
-copt_x86emu=CONFIG_X86EMU
-copt_x86emu_desc="Use x86emu for BIOS calls"
-copt_x86emu_type="bool"
-copt_x86emu_def=auto
-copt_x86emu_test()
-{
- local m=`uname -m`
- if [ "$m" = "i686" -o "$m" = "i586" -o "$m" = "i486" -o "$m" = "i386" ]; then
- echo "n";
- elif [ "$m" = "x86_64" ]; then
- echo "y";
- else
- echo "It looks like your architecture '$m' isn't supported by this version of v86d." >&2
- exit 1
- fi
-}
-
options=`set | grep '^copt_' | sed -re 's/copt_([^_=]+)[_=].*/\1/' | uniq`
write_conf()
diff --git a/debian/control b/debian/control
index bd03e0f..7526dfd 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: v86d
Section: utils
Priority: optional
Maintainer: Evgeni Golov <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 5), libx86-dev
Standards-Version: 3.8.0
Homepage: http://dev.gentoo.org/~spock/projects/uvesafb/
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
deleted file mode 100644
index 57e25ba..0000000
--- a/debian/lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# v86d is called by the kernel at a time, when some libs may be unavailable
-v86d binary: statically-linked-binary
diff --git a/debian/rules b/debian/rules
index a701a42..69c2763 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
config: config-stamp
config-stamp: configure
dh_testdir
- ./configure --with-x86emu
+ ./configure --default
# Debian's klibc has no UVESAFB support yet, as soon 2.6.26
# enters unstable and klibc is rebuilt against it, we can
# enable the following option:
diff --git a/v86_lrmi.c b/v86_lrmi.c
index 61f6bf5..ea5fafe 100644
--- a/v86_lrmi.c
+++ b/v86_lrmi.c
@@ -1,5 +1,5 @@
#include <string.h>
-#include <lrmi.h>
+#include <libx86.h>
#include "v86.h"
/* Memory access functions */
--
1.5.6
--- End Message ---
--- Begin Message ---
Source: v86d
Source-Version: 0.1.5.2-1
We believe that the bug you reported is fixed in the latest version of
v86d, which is due to be installed in the Debian FTP archive:
v86d_0.1.5.2-1.diff.gz
to pool/main/v/v86d/v86d_0.1.5.2-1.diff.gz
v86d_0.1.5.2-1.dsc
to pool/main/v/v86d/v86d_0.1.5.2-1.dsc
v86d_0.1.5.2-1_amd64.deb
to pool/main/v/v86d/v86d_0.1.5.2-1_amd64.deb
v86d_0.1.5.2.orig.tar.gz
to pool/main/v/v86d/v86d_0.1.5.2.orig.tar.gz
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Evgeni Golov <[EMAIL PROTECTED]> (supplier of updated v86d package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Wed, 23 Jul 2008 20:50:55 +0200
Source: v86d
Binary: v86d
Architecture: source amd64
Version: 0.1.5.2-1
Distribution: unstable
Urgency: low
Maintainer: Evgeni Golov <[EMAIL PROTECTED]>
Changed-By: Evgeni Golov <[EMAIL PROTECTED]>
Description:
v86d - daemon to run x86 code in an emulated environment
Closes: 489415
Changes:
v86d (0.1.5.2-1) unstable; urgency=low
.
* New upstream release.
* debian/control, debian/rules, debian/README.source:
+ Added quilt for patch managing.
* debian/patches/01_use-external-libx86.patch, debian/patches/series:
Added a patch for linking against libx86 (Closes: #489415).
Patch by Guillem Jover <[EMAIL PROTECTED]>, thanks!
* debian/lintian-overrides, debian/rules:
+ Remove lintian override, it was never used and will never be.
* debian/control, debian/initramfs-hook, debian/postinst, debian/postrm,
debian/rules:
+ Added initramfs hook, inspired by the Ubuntu patch, thanks!
* debian/control:
+ Removed reference to glibc, it's okay to build v86d against it.
Checksums-Sha1:
b4b9f6d45f86464d71dcbda386697e412ca1134e 1024 v86d_0.1.5.2-1.dsc
0f46126ac28a9508510196b9e3f1adf764acbe85 83452 v86d_0.1.5.2.orig.tar.gz
27fe2c859954d1a49b4f955da03b153c405d78f6 5664 v86d_0.1.5.2-1.diff.gz
7e6e8aeb4e139ed313e1454d746f3a7b7e785176 11242 v86d_0.1.5.2-1_amd64.deb
Checksums-Sha256:
ba3eed2503f64fa28377e7eed2c5d79650f4b7b831814ac97688d07cc563a98e 1024
v86d_0.1.5.2-1.dsc
771424e0d4ad393aae9351d8e447635a6830b60faafe16b65c8e1fa2f2444a30 83452
v86d_0.1.5.2.orig.tar.gz
5cab6da8ddedae7eaf1f8d8ee1a97a1814aee6cba56290ca08f9e5a46b01b299 5664
v86d_0.1.5.2-1.diff.gz
b96d4f24187f8594c2a533910929b89ccd9da82432b1ba5893bde5bca2d0f35c 11242
v86d_0.1.5.2-1_amd64.deb
Files:
759fa42957763d2b4cfbb548eabdca1a 1024 utils optional v86d_0.1.5.2-1.dsc
47146d7a20f8cb696c9992ce39ff6855 83452 utils optional v86d_0.1.5.2.orig.tar.gz
d3b25cb3aac3b5feca95d65e04fb086e 5664 utils optional v86d_0.1.5.2-1.diff.gz
58e37861bd441c02b2a3cf29a5a19b99 11242 utils optional v86d_0.1.5.2-1_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEARECAAYFAkiIw5gACgkQfPP1rylJn2H+sgCgrCxGSaJeW/NSK0iXzGhbsqds
+UAAoIbHZQHa9r7sekZ9COKSjaaeXh6k
=4Hh1
-----END PGP SIGNATURE-----
--- End Message ---
