summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanno Böck <hanno@gentoo.org>2008-02-29 12:01:42 +0000
committerHanno Böck <hanno@gentoo.org>2008-02-29 12:01:42 +0000
commit636247810f5915dc2fc045495907e3f16b3c2c6a (patch)
treeb063a9651879803979660abe6ce06691f67e1c3b /app-emulation/dosemu/files
parentFixed security issue (CVE-2008-0411), bug #208999, thank Robert Buchholz for ... (diff)
downloadgentoo-2-636247810f5915dc2fc045495907e3f16b3c2c6a.tar.gz
gentoo-2-636247810f5915dc2fc045495907e3f16b3c2c6a.tar.bz2
gentoo-2-636247810f5915dc2fc045495907e3f16b3c2c6a.zip
big cleanup of old dosemu stuff
(Portage version: 2.1.4.4)
Diffstat (limited to 'app-emulation/dosemu/files')
-rw-r--r--app-emulation/dosemu/files/dosemu-1.2.2-cflags.patch83
-rw-r--r--app-emulation/dosemu/files/dosemu-1.3.3-configure.ac.patch87
-rw-r--r--app-emulation/dosemu/files/dosemu-1.3.4-slang2.diff27
-rw-r--r--app-emulation/dosemu/files/dosemu-1.3.5-slang2.diff32
-rw-r--r--app-emulation/dosemu/files/dosemu-broken-links.diff11
-rw-r--r--app-emulation/dosemu/files/dosemu-compile-asm.diff11
6 files changed, 0 insertions, 251 deletions
diff --git a/app-emulation/dosemu/files/dosemu-1.2.2-cflags.patch b/app-emulation/dosemu/files/dosemu-1.2.2-cflags.patch
deleted file mode 100644
index c779b3077d6a..000000000000
--- a/app-emulation/dosemu/files/dosemu-1.2.2-cflags.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- dosemu-1.2.2/configure.ac.orig 2005-04-04 21:58:49.635588970 -0700
-+++ dosemu-1.2.2/configure.ac 2005-04-04 21:56:35.277976095 -0700
-@@ -15,7 +15,6 @@ AC_CONFIG_HEADER(src/include/config.h)
- AC_CANONICAL_TARGET([])
-
- dnl Checks for programs.
--OPT=$CFLAGS
- AC_PROG_CC
- AC_PROG_GCC_TRADITIONAL
- AC_PROG_AWK
-@@ -447,19 +446,6 @@ dnl Now CFLAGS and INCLUDES
- INCDIR="-I\${top_builddir}/src/include -I\${top_builddir}/src/plugin/include ${SLANGINC}"
- AC_SUBST(INCDIR)
-
--CFLAGS="-Wall -Wstrict-prototypes -Wmissing-declarations -Wnested-externs"
--if test -z "$OPT"; then
-- if test "$enable_debug" = "yes"; then
-- CFLAGS="$CFLAGS -g"
-- AC_DEFINE(_DEBUG)
-- OPT="-O"
-- else
-- OPT="-O2" # BIG NOTE: do _not_ use -O3,
-- # because in forces _inline_ at places where we don't want it !
-- # If we want _inline_, well then we 'code' it.
-- OPT="$OPT -fomit-frame-pointer" # never omit the frame pointer when debugging!
-- fi
--fi
- if test "$enable_debug" = "yes"; then
- AC_DEFINE(_DEBUG)
- fi
-@@ -509,7 +495,6 @@ if test "$CONFIG_HOST" = "linux"; then
- AC_MSG_NOTICE(Compiling with network support...);
- AC_DEFINE(USING_NET)
- fi
-- PIPE=-pipe
- fi
-
-
-@@ -545,36 +530,6 @@ if test "$GCC" = "yes" ; then
- fi
-
-
-- # -m486 is usually in the specs for the compiler
-- # but gcc-3.0 wants -mcpu=i486 instead
-- # and gcc-3.4 wants -mtune=i486 instead
-- # let the compiler options be dependent of the _target_
-- # where dosemu is compiled for, not the host
-- if test "$target_cpu" = "athlon" -a $GCC_VERSION_CODE -le 2095 ; then
-- target_cpu="i686"
-- fi
-- if test "$GCC_VERSION_CODE" -ge 3004 ; then
-- OPT="$OPT -mtune=$target_cpu"
-- elif test "$GCC_VERSION_CODE" -ge 2095 ; then
-- OPT="$OPT -mcpu=$target_cpu"
-- else
-- case "$target_cpu" in
-- i486)
-- OPT="$OPT -m486"
-- ;;
-- i386)
-- OPT="$OPT -m386"
-- ;;
-- *)
-- ;;
-- esac
-- fi
-- if test "$target_cpu" = "athlon"; then
-- OPT="$OPT -malign-functions=4 -fexpensive-optimizations"
-- elif test "$target_cpu" = "i486"; then
-- OPT="$OPT -malign-loops=2 -malign-jumps=2 -malign-functions=2"
-- fi
--
- AC_MSG_CHECKING(for glibc...)
- set `printf '%b\n' '#include <features.h>\nXXAaZZ __GLIBC__ XXBbZZ __GLIBC_MINOR__'|gcc -E -|awk '/XXAaZZ/ {print $2 " " $4}'`
- major=$1; minor=$2
-@@ -595,7 +550,6 @@ AC_DEFINE_UNQUOTED(GCC_VERSION_CODE,$GCC
- AC_SUBST(ASM_PEDANTIC)
- AC_DEFINE(_GNU_SOURCE)
-
--CFLAGS="${CFLAGS} ${OPT} ${PIPE}"
- CPPFLAGS="${CPPFLAGS} -MMD \${INCDIR}"
- AC_SUBST(LDFLAGS)
- AC_SUBST(LIBS)
diff --git a/app-emulation/dosemu/files/dosemu-1.3.3-configure.ac.patch b/app-emulation/dosemu/files/dosemu-1.3.3-configure.ac.patch
deleted file mode 100644
index 51dfe03202af..000000000000
--- a/app-emulation/dosemu/files/dosemu-1.3.3-configure.ac.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- dosemu-old/configure.ac 2005-12-21 20:47:43.000000000 -0500
-+++ dosemu-1.3.3/configure.ac 2006-02-23 15:07:06.000000000 -0500
-@@ -15,7 +15,6 @@
- AC_CANONICAL_TARGET([])
-
- dnl Checks for programs.
--OPT=$CFLAGS
- AC_PROG_CC
- if test "$host_cpu" = "x86_64" -a -z "$CPPFLAGS"; then
- # 64bit long mode dosemu is not yet
-@@ -478,19 +477,6 @@
- INCDIR="-I\${top_builddir}/src/include -I\${top_builddir}/src/plugin/include"
- AC_SUBST(INCDIR)
-
--CFLAGS="-Wall -Wstrict-prototypes -Wmissing-declarations -Wnested-externs"
--if test -z "$OPT"; then
-- if test "$enable_debug" = "yes"; then
-- CFLAGS="$CFLAGS -g"
-- AC_DEFINE(_DEBUG)
-- OPT="-O"
-- else
-- OPT="-O2" # BIG NOTE: do _not_ use -O3,
-- # because in forces _inline_ at places where we don't want it !
-- # If we want _inline_, well then we 'code' it.
-- OPT="$OPT -fomit-frame-pointer" # never omit the frame pointer when debugging!
-- fi
--fi
- if test "$enable_debug" = "yes"; then
- AC_DEFINE(_DEBUG)
- fi
-@@ -540,7 +526,6 @@
- AC_MSG_NOTICE(Compiling with network support...);
- AC_DEFINE(USING_NET)
- fi
-- PIPE=-pipe
- fi
-
-
-@@ -590,39 +575,6 @@
- fi
-
-
-- # -m486 is usually in the specs for the compiler
-- # but gcc-3.0 wants -mcpu=i486 instead
-- # and gcc-3.4 wants -mtune=i486 instead
-- # let the compiler options be dependent of the _target_
-- # where dosemu is compiled for, not the host
-- if test "$target_cpu" = "athlon" -a $GCC_VERSION_CODE -le 2095 ; then
-- target_cpu="i686"
-- fi
-- if test "$target_cpu" = "x86_64"; then
-- target_cpu="k8"
-- fi
-- if test "$GCC_VERSION_CODE" -ge 3004 ; then
-- OPT="$OPT -mtune=$target_cpu"
-- elif test "$GCC_VERSION_CODE" -ge 2095 ; then
-- OPT="$OPT -mcpu=$target_cpu"
-- else
-- case "$target_cpu" in
-- i486)
-- OPT="$OPT -m486"
-- ;;
-- i386)
-- OPT="$OPT -m386"
-- ;;
-- *)
-- ;;
-- esac
-- fi
-- if test "$target_cpu" = "athlon"; then
-- OPT="$OPT -malign-functions=4 -fexpensive-optimizations"
-- elif test "$target_cpu" = "i486"; then
-- OPT="$OPT -malign-loops=2 -malign-jumps=2 -malign-functions=2"
-- fi
--
- AC_MSG_CHECKING(for glibc...)
- set `printf '%b\n' '#include <features.h>\nXXAaZZ __GLIBC__ XXBbZZ __GLIBC_MINOR__'|${CC-cc} -E -|awk '/XXAaZZ/ {print $2 " " $4}'`
- major=$1; minor=$2
-@@ -643,7 +595,7 @@
- AC_SUBST(ASM_PEDANTIC)
- AC_DEFINE(_GNU_SOURCE)
-
--CFLAGS="${CFLAGS} ${OPT} ${PIPE}"
-+CFLAGS=${OPT}
- CPPFLAGS="${CPPFLAGS} -MMD"
- AC_SUBST(LDFLAGS)
- AC_SUBST(LIBS)
diff --git a/app-emulation/dosemu/files/dosemu-1.3.4-slang2.diff b/app-emulation/dosemu/files/dosemu-1.3.4-slang2.diff
deleted file mode 100644
index dbf4a2ac6893..000000000000
--- a/app-emulation/dosemu/files/dosemu-1.3.4-slang2.diff
+++ /dev/null
@@ -1,27 +0,0 @@
---- dosemu-1.1.5-old/configure.ac
-+++ dosemu-1.1.5/configure.ac
-@@ -262,8 +262,8 @@
- else
- if test -d $prefix/include/slang; then
- SLANGINC="-I${prefix}/include/slang"
-- elif test -d /usr/include/slang; then
-- SLANGINC="-I/usr/include/slang"
-+ elif test -d /usr/include/slang-2; then
-+ SLANGINC="-I/usr/include/slang-2"
- fi
- fi
- else
-@@ -286,11 +286,11 @@
- AC_MSG_RESULT($SLANGINC $SLANGLIB)
- have_slang="no"
- AC_CHECK_HEADER(slang.h,
-- AC_CHECK_LIB(slang, SLtt_get_terminfo,
-+ AC_CHECK_LIB(slang-2, SLtt_get_terminfo,
- AC_MSG_NOTICE(Compiling with S-Lang support...)
- have_slang="yes"
- AC_DEFINE(USE_SLANG)
-- SLANGLIB="$SLANGLIB -lslang -lm",
-+ SLANGLIB="$SLANGLIB -lslang-2 -lm",
- [AC_MSG_WARN([No S-Lang library found.])]
- $srcdir/mkpluginhooks enable term no
- ),
diff --git a/app-emulation/dosemu/files/dosemu-1.3.5-slang2.diff b/app-emulation/dosemu/files/dosemu-1.3.5-slang2.diff
deleted file mode 100644
index 464ed9a7e75d..000000000000
--- a/app-emulation/dosemu/files/dosemu-1.3.5-slang2.diff
+++ /dev/null
@@ -1,32 +0,0 @@
---- dosemu-1.3.5/configure.ac 2006-12-10 15:03:24.000000000 +0100
-+++ dosemu-1.3.5-fix/configure.ac 2007-05-02 04:46:00.000000000 +0200
-@@ -291,6 +291,8 @@
- SLANGINC="-I${prefix}/include/slang"
- elif test -d /usr/include/slang; then
- SLANGINC="-I/usr/include/slang"
-+ elif test -d /usr/include/slang-2; then
-+ SLANGINC="-I/usr/include/slang-2"
- fi
- fi
- else
-@@ -313,13 +315,19 @@
- AC_MSG_RESULT($SLANGINC $SLANGLIB)
- have_slang="no"
- AC_CHECK_HEADER(slang.h,
-+ AC_CHECK_LIB(slang-2, SLtt_get_terminfo,
-+ AC_MSG_NOTICE(Compiling with S-Lang support...)
-+ have_slang="yes"
-+ AC_DEFINE(USE_SLANG)
-+ SLANGLIB="$SLANGLIB -lslang-2 -lm",
-+ [AC_MSG_WARN([No S-Lang library found.])]
-+ ),
- AC_CHECK_LIB(slang, SLtt_get_terminfo,
- AC_MSG_NOTICE(Compiling with S-Lang support...)
- have_slang="yes"
- AC_DEFINE(USE_SLANG)
- SLANGLIB="$SLANGLIB -lslang -lm",
- [AC_MSG_WARN([No S-Lang library found.])]
-- $srcdir/mkpluginhooks enable term no
- ),
- [AC_MSG_WARN([No S-Lang header file found.])]
- $srcdir/mkpluginhooks enable term no
diff --git a/app-emulation/dosemu/files/dosemu-broken-links.diff b/app-emulation/dosemu/files/dosemu-broken-links.diff
deleted file mode 100644
index 2c1db5848cd3..000000000000
--- a/app-emulation/dosemu/files/dosemu-broken-links.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- dosemu-1.1.5/src/arch/linux/Makefile.main~ 2003-06-06 23:32:21.000000000 +0100
-+++ dosemu-1.1.5/src/arch/linux/Makefile.main 2003-06-20 15:22:19.000000000 +0100
-@@ -158,7 +158,7 @@
- cd $(SYS); for i in `find * -type l`; do \
- ln -sf generic.com $(TMP)/dosemu/freedos/dosemu/$$i; \
- done
-- cp -a $(TMP)/dosemu/freedos $(DESTDIR)$(dosemudir)
-+ cp -aL $(TMP)/dosemu/freedos $(DESTDIR)$(dosemudir)
- rm -f $(DESTDIR)$(dosemudir)/commands
- ln -sf freedos/dosemu $(DESTDIR)$(dosemudir)/commands
- cd $(TMP)/dosemu; \
diff --git a/app-emulation/dosemu/files/dosemu-compile-asm.diff b/app-emulation/dosemu/files/dosemu-compile-asm.diff
deleted file mode 100644
index a404d57cf4ab..000000000000
--- a/app-emulation/dosemu/files/dosemu-compile-asm.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- dosemu-1.3.4/src/env/video/instremu.c 2006-11-11 23:22:27.000000000 +0100
-+++ dosemu-1.3.4-p/src/env/video/instremu.c 2007-01-30 13:36:08.000000000 +0100
-@@ -112,7 +112,7 @@
- shr $1, %0\n\
- "#insn" %4, %1\n\
- pushf; pop %0\n \
-- " : "=g" (eflags), #istype (op1) : "0" (eflags), "1" (op1), #type (op2));
-+ " : "=r" (eflags), #istype (op1) : "0" (eflags), "1" (op1), #type (op2));
-
-
- #if !defined True