--- libx86-1.1+ds1.orig/debian/libx86-1.shlibs +++ libx86-1.1+ds1/debian/libx86-1.shlibs @@ -0,0 +1 @@ +libx86 1 libx86-1 (>= 0.99-1) --- libx86-1.1+ds1.orig/debian/rules +++ libx86-1.1+ds1/debian/rules @@ -0,0 +1,70 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/quilt/quilt.make + +DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH) + +ifneq (,$(filter i386 lpia,$(DEB_HOST_ARCH))) + BACKEND = +else + BACKEND = x86emu +endif + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS := -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +endif +MAKEFLAGS += $(NUMJOBS) + +build: build-stamp +build-stamp: $(QUILT_STAMPFN) + dh_testdir + $(MAKE) BACKEND="$(BACKEND)" $(MAKEFLAGS) + touch $@ + +clean: unpatch + dh_testdir + dh_testroot + dh_clean build-stamp configure-stamp + [ ! -f Makefile ] || $(MAKE) clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + + dh_install --sourcedir=$(CURDIR)/debian/tmp + +binary-indep: build install +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installman + dh_link + dh_strip --dbg-package=libx86-dbg + dh_compress + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- libx86-1.1+ds1.orig/debian/libx86-dev.dirs +++ libx86-1.1+ds1/debian/libx86-dev.dirs @@ -0,0 +1,2 @@ +usr/lib +usr/include --- libx86-1.1+ds1.orig/debian/compat +++ libx86-1.1+ds1/debian/compat @@ -0,0 +1 @@ +5 --- libx86-1.1+ds1.orig/debian/libx86-1.dirs +++ libx86-1.1+ds1/debian/libx86-1.dirs @@ -0,0 +1 @@ +lib --- libx86-1.1+ds1.orig/debian/watch +++ libx86-1.1+ds1/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://www.codon.org.uk/~mjg59/libx86/downloads/libx86-([[:digit:]].*)\.tar\.gz --- libx86-1.1+ds1.orig/debian/changelog +++ libx86-1.1+ds1/debian/changelog @@ -0,0 +1,94 @@ +libx86 (1.1+ds1-2) unstable; urgency=low + + * Disable the x86emu backend for lpia architecture (Closes: #488100) + * debian/patches/: + - 01-fix_processor_flags.patch added, Linux 2.6.26-rc1 and newer no + longer define *_MASK; use X86_EFLAGS_* instead (thanks to Colin + Watson) (Closes: #488101) + * debian/control: + - Standards-Version bumped to 3.8.0: + + debian/rules improved to allow parallel building $(MAKE) jobs. + + -- David Paleino Thu, 26 Jun 2008 14:43:35 +0200 + +libx86 (1.1+ds1-1) unstable; urgency=low + + * New upstream release + - fix mmap() call, which segfaulted on NX-capable kernels/arches + - handle reading addresses that are outside the process range with + the x86emu backend + * Make libx86 build again on Arch: any (Closes: #478186) + - debian/rules updated + - debian/control updated + * debian/patches: + - 00-fix_Makefile.patch updated + - 01-read_addresses_outside_process_range_x86emu.patch removed, applied + upstream. + - 02-fix_memory_mmap_flags.patch removed, applied upstream. + + -- David Paleino Fri, 30 May 2008 18:45:05 +0200 + +libx86 (0.99+ds1-2) unstable; urgency=low + + * Make libx86 mmap memory with PROT_EXEC flag set (Closes: #476586) + (debian/patches/02-fix_memory_mmap_flags.patch added -- thanks to + Klaus S. Madsen) + * debian/control: + - build the package only on i386 and amd64 + - removed libc6-dev from Build-Depends + + -- David Paleino Fri, 25 Apr 2008 10:27:24 +0200 + +libx86 (0.99+ds1-1) unstable; urgency=low + + * Adopting the package (Closes: #459900) + * Acknowledge previous NMUs + * debian/watch added + * debian/{dirs,docs} removed + * debian/libx86-1.shlibs added + * debian/control: + - Standards-Version updated (no changes needed) + - Maintainer updated + - added new package "libx86-dbg", which provides debugging symbols + - Vcs-Svn and Vcs-Browser added: the package is now in collab-maint + - Homepage field added + - added quilt to Build-Depends + * debian/rules updated: + - removed useless and commented dh_* calls + - failsafe $(MAKE) clean + - removed useless configure target + - support quilt patch system + - other minor changes + * debian/copyright rewritten + * debian/README.Debian-source added + * debian/patches: + - 00-fix_Makefile.patch added (merging changes to upstream + sources, made by the previous maintainer, into a nice quilt + patch) + - 01-read_addresses_outside_process_range_x86emu.patch + added (imported from Ubuntu version 0.99-1.2ubuntu2) + + -- David Paleino Sat, 09 Feb 2008 10:50:44 +0100 + +libx86 (0.99-1.2) unstable; urgency=low + + * Non-maintainer upload. + * Move libx86.so.1 to /lib + (https://launchpad.net/ubuntu/+source/libx86/+bug/83920). + + -- Colin Watson Thu, 8 Feb 2007 09:08:05 +0000 + +libx86 (0.99-1.1) unstable; urgency=low + + * Non-maintainer upload with maintainer consent. + * debian/rules, Makefile: Fix some misuses of make that prevented x86emu + from being used on amd64 systems. + + -- Colin Watson Tue, 6 Feb 2007 16:01:55 +0000 + +libx86 (0.99-1) unstable; urgency=low + + * Initial release + + -- Matthew Garrett Sun, 29 Oct 2006 18:43:31 +0000 + --- libx86-1.1+ds1.orig/debian/copyright +++ libx86-1.1+ds1/debian/copyright @@ -0,0 +1,72 @@ +Source: http://www.codon.org.uk/~mjg59/libx86/ + +Files: debian/* +Copyright: © 2008, David Paleino + © 2006, Matthew Garrett +License: other + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + . + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL JOSH VANDERHOOF BE LIABLE FOR ANY CLAIM, DAMAGES OR + OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + +Files: * +Copyright: © 2005-2006, Matthew Garrett + Jonathan McDowell + © 1998, Josh Vanderhoof +License: other + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + . + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL JOSH VANDERHOOF BE LIABLE FOR ANY CLAIM, DAMAGES OR + OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + + +Files: x86emu/* +Copyright: © 1999, Egbert Eich + © David Mosberger-Tang + © 1996-1999, SciTech Software, Inc. +License: other + Permission to use, copy, modify, distribute, and sell this software and + its documentation for any purpose is hereby granted without fee, + provided that the above copyright notice appear in all copies and that + both that copyright notice and this permission notice appear in + supporting documentation, and that the name of the authors not be used + in advertising or publicity pertaining to distribution of the software + without specific, written prior permission. The authors makes no + representations about the suitability of this software for any purpose. + It is provided "as is" without express or implied warranty. + . + THE AUTHORS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + EVENT SHALL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT OR + CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF + USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR + OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + PERFORMANCE OF THIS SOFTWARE. --- libx86-1.1+ds1.orig/debian/control +++ libx86-1.1+ds1/debian/control @@ -0,0 +1,38 @@ +Source: libx86 +Priority: optional +Maintainer: David Paleino +Build-Depends: debhelper (>= 5.0.0), quilt +Standards-Version: 3.8.0 +Section: libs +Homepage: http://www.codon.org.uk/~mjg59/libx86/ +Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/libx86/trunk/ +Vcs-Browser: http://svn.debian.org/wsvn/collab-maint/deb-maint/libx86/trunk/?rev=0&sc=0 + +Package: libx86-dev +Section: libdevel +Architecture: any +Depends: libx86-1 (= ${binary:Version}) +Description: x86 real-mode library - development files + A library to provide support for making real-mode calls x86 calls. On x86 + hardware, vm86 mode is used. On other platforms, x86 emulation is provided. + . + This package contains the development files for libx86. + +Package: libx86-1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: x86 real-mode library + A library to provide support for making real-mode calls x86 calls. On x86 + hardware, vm86 mode is used. On other platforms, x86 emulation is provided. + +Package: libx86-dbg +Section: libs +Architecture: any +Priority: extra +Depends: libx86-1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Description: x86 real-mode library - debugging symbols + A library to provide support for making real-mode calls x86 calls. On x86 + hardware, vm86 mode is used. On other platforms, x86 emulation is provided. + . + This package provides debugging symbols for libx86. --- libx86-1.1+ds1.orig/debian/README.Debian-source +++ libx86-1.1+ds1/debian/README.Debian-source @@ -0,0 +1,8 @@ +libx86 for Debian +----------------- + + The upstream source has been repackaged because: + a) it shipped a debian/ directory + b) it shipped precompiled binary libraries + + -- David Paleino Wed, 06 Feb 2008 19:34:53 +0100 --- libx86-1.1+ds1.orig/debian/libx86-dev.install +++ libx86-1.1+ds1/debian/libx86-dev.install @@ -0,0 +1,3 @@ +usr/include/* +usr/lib/lib*.a +usr/lib/lib*.so --- libx86-1.1+ds1.orig/debian/libx86-1.install +++ libx86-1.1+ds1/debian/libx86-1.install @@ -0,0 +1 @@ +lib/lib*.so.* --- libx86-1.1+ds1.orig/debian/patches/00-fix_Makefile.patch +++ libx86-1.1+ds1/debian/patches/00-fix_Makefile.patch @@ -0,0 +1,12 @@ +--- libx86-1.1.orig/Makefile ++++ libx86-1.1/Makefile +@@ -32,7 +32,7 @@ + rm -f *.so.1 *.a + + install: libx86.so.1 +- install -D libx86.so.1 $(DESTDIR)$(LIBDIR)/libx86.so.1 ++ install -D libx86.so.1 $(DESTDIR)/lib/libx86.so.1 + install -D libx86.a $(DESTDIR)$(LIBDIR)/libx86.a +- ln -sf libx86.so.1 $(DESTDIR)$(LIBDIR)/libx86.so ++ ln -sf /lib/libx86.so.1 $(DESTDIR)$(LIBDIR)/libx86.so + install -p -m 0644 -D lrmi.h $(DESTDIR)/usr/include/libx86.h --- libx86-1.1+ds1.orig/debian/patches/01-fix_processor_flags.patch +++ libx86-1.1+ds1/debian/patches/01-fix_processor_flags.patch @@ -0,0 +1,21 @@ +--- libx86.orig/lrmi.c ++++ libx86/lrmi.c +@@ -55,6 +55,18 @@ + #include "x86-common.h" + + #if defined(__linux__) ++#ifndef TF_MASK ++#define TF_MASK X86_EFLAGS_TF ++#endif ++#ifndef IF_MASK ++#define IF_MASK X86_EFLAGS_IF ++#endif ++#ifndef IOPL_MASK ++#define IOPL_MASK X86_EFLAGS_IOPL ++#endif ++#ifndef VIF_MASK ++#define VIF_MASK X86_EFLAGS_VIF ++#endif + #define DEFAULT_VM86_FLAGS (IF_MASK | IOPL_MASK) + #elif defined(__NetBSD__) || defined(__FreeBSD__) + #define DEFAULT_VM86_FLAGS (PSL_I | PSL_IOPL) --- libx86-1.1+ds1.orig/debian/patches/series +++ libx86-1.1+ds1/debian/patches/series @@ -0,0 +1,2 @@ +00-fix_Makefile.patch +01-fix_processor_flags.patch