*** empty log message ***

Changed files:
    dosemu-0.66.7-config.patch -> 1.2
    dosemu-0.66.7-glibc.patch -> 1.2
    dosemu-0.66.7-pushal.patch -> 1.2
    dosemu-0.98.1-justroot.patch -> 1.2
    dosemu-1.0.1-broken.patch -> 1.2
    dosemu-cpp_macros.patch -> 1.2
    dosemu-man-pages.patch -> 1.2
    dosemu-time.patch -> 1.2

diff --git a/dosemu-0.66.7-config.patch b/dosemu-0.66.7-config.patch
deleted file mode 100644 (file)
index 1b9ff9d..0000000
--- a/dosemu-0.66.7-config.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- dosemu-0.66.7/etc/config.dist.lock Sun May 18 23:39:43 1997
-+++ dosemu-0.66.7/etc/config.dist      Mon Nov  3 18:28:37 1997
-@@ -95,7 +95,7 @@
-       #mouse { ps2  device /dev/mouse internaldriver emulate3buttons }
-       #mouse { mousesystems device /dev/mouse internaldriver cleardtr }
-       #ttylocks { directory /var/lock }
--      #ttylocks { directory /var/lock namestub LCK.. }
-+      ttylocks { directory /var/lock namestub LCK.. }
-       #ttylocks { directory /var/lock namestub LCK.. binary }
- 
-   video { vga }          ## Use this line, if you are using VGA
-@@ -127,7 +127,9 @@
-   dexe { secure }
-   ifndef guest
-     ifndef c_dexerun
--      disk { image "/var/lib/dosemu/hdimage.first" }
-+      # If you are following the QuickStart guide, use this line:
-+      # disk { image "/var/lib/dosemu/hdimage.first" }
-+      disk { image "/var/lib/dosemu/hdimage" }
-     endif
-   endif
-   dpmi off
-@@ -139,9 +141,11 @@
-   secure off
-   dexe { allowdisk }
-   ifndef vbootfloppy
--    bootC               ## Startup drive valid values:  bootA  bootC
-+    bootA               ## Startup drive valid values:  bootA  bootC
-     ifndef c_dexerun
--      disk { image "/var/lib/dosemu/hdimage.first" }   ## use diskimage file.
-+      # If you are following the QuickStart guide, use this line:
-+      # disk { image "/var/lib/dosemu/hdimage.first" }
-+      disk { image "/var/lib/dosemu/hdimage" }   ## use diskimage file.
-     endif
-   endif
-       #disk { partition "/dev/hda1" readonly }       ## 1st partition on 1st IDE.

diff --git a/dosemu-0.66.7-glibc.patch b/dosemu-0.66.7-glibc.patch
deleted file mode 100644 (file)
index 02dcf9d..0000000
--- a/dosemu-0.66.7-glibc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- dosemu-0.66.7/src/dosext/net/net/ipx.c.glibc       Mon Nov  3 16:42:48 1997
-+++ dosemu-0.66.7/src/dosext/net/net/ipx.c     Mon Nov  3 16:45:34 1997
-@@ -16,8 +16,8 @@
- #include <sys/types.h>
- #include <sys/vm86.h>
- #include <linux/sockios.h>
--#include <asm/types.h>
--#include <linux/ipx.h>
-+#include <sys/types.h>
-+#include <netipx/ipx.h>
- #ifndef IPX_TYPE
-   #define IPX_TYPE 1   /* glibc's headers seem missing that
-                           (normally defined in <linux/socket.h>) */

diff --git a/dosemu-0.66.7-pushal.patch b/dosemu-0.66.7-pushal.patch
deleted file mode 100644 (file)
index a074ad3..0000000
--- a/dosemu-0.66.7-pushal.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- dosemu-0.66.7/src/dosext/dpmi/dpmi.c~      Sat Jun 14 22:57:27 1997
-+++ dosemu-0.66.7/src/dosext/dpmi/dpmi.c       Fri Apr 10 16:08:51 1998
-@@ -540,7 +540,7 @@
-       xorl   %0,%0   "/* preset return code with 0 */"
-       push   %%eax   "/* dummy, err */"
-       push   %%eax   "/* dummy, trapno */"
--      pushal
-+      pusha
-       addl   $10*4,12(%%esp)   "/* adjust esp */"
-       push   %%ds
-       push   %%es
-@@ -568,7 +568,7 @@
-       pop    %%fs
-       pop    %%es
-       pop    %%ds
--      popal
-+      popa
-       popfl
-       lss    (%%esp),%%esp  "/* this is: pop ss; pop esp */"
-       jmp    __dpmi_switch_jmp   

diff --git a/dosemu-0.98.1-justroot.patch b/dosemu-0.98.1-justroot.patch
deleted file mode 100644 (file)
index a0533d2..0000000
--- a/dosemu-0.98.1-justroot.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- dosemu-0.98.1/etc/dosemu.users.secure.justroot     Wed Aug 26 17:41:51 1998
-+++ dosemu-0.98.1/etc/dosemu.users.secure      Tue Sep 15 19:04:44 1998
-@@ -25,5 +25,6 @@
- nobody nosuidroot guest       # variable 'guest' is checked in /etc/dosemu.conf
-                       # to allow only DEXE execution
- guest nosuidroot guest        # login guest treated as 'nobody'
--all nosuidroot restricted # all other users have normal user restrictions
-+# If you want to allow limited dosemu to all users, uncomment the line below
-+# all nosuidroot restricted # all other users have normal user restrictions
- 

diff --git a/dosemu-1.0.1-broken.patch b/dosemu-1.0.1-broken.patch
deleted file mode 100644 (file)
index b4172f3..0000000
--- a/dosemu-1.0.1-broken.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- dosemu-1.0.1/src/base/keyboard/serv_xlat.c.orig    Mon Jul 24 00:07:15 2000
-+++ dosemu-1.0.1/src/base/keyboard/serv_xlat.c Mon Jul 24 00:08:15 2000
-@@ -310,7 +310,7 @@
-                   bios_scan=0x0f; ascii=0; break;
-           case KEY_RETURN:
-                   bios_scan=0x1c; ascii=0x0d; break;
--          case KEY_F1...KEY_F10:
-+          case KEY_F1 ... KEY_F10:
-                   bios_scan=key+(0x54-KEY_F1); break;
-           case KEY_F11:
-                   bios_scan=0x87; break;
---- dosemu-1.0.1/src/tools/periph/dexeconfig.c.orig    Tue Jul 25 20:10:30 2000
-+++ dosemu-1.0.1/src/tools/periph/dexeconfig.c Tue Jul 25 20:10:50 2000
-@@ -5,6 +5,7 @@
-  */
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #include <unistd.h>
- #include <sys/types.h>
- #include <sys/stat.h>
---- dosemu-1.0.1/src/base/keyboard/keymaps.c.orig      Tue Jul 25 20:37:19 2000
-+++ dosemu-1.0.1/src/base/keyboard/keymaps.c   Tue Jul 25 20:37:47 2000
-@@ -7,6 +7,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#include <string.h>
- #include <linux/kd.h>
- #include <linux/keyboard.h>
- #include <sys/ioctl.h>

diff --git a/dosemu-cpp_macros.patch b/dosemu-cpp_macros.patch
deleted file mode 100644 (file)
index 0b1939f..0000000
--- a/dosemu-cpp_macros.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- dosemu-1.0.1/src/base/data.c~      Sun Mar  5 13:57:37 2000
-+++ dosemu-1.0.1/src/base/data.c       Sun Dec  2 17:17:05 2001
-@@ -5,7 +5,7 @@
-  */
- 
- #define EXTERN 
--#define INIT(x...)            =  ## x
-+#define INIT(x...)            = x
- 
- #include <termios.h>
- #include <sys/types.h>
---- dosemu-1.0.1/base-configure.in~    Sun Jun 18 16:34:22 2000
-+++ dosemu-1.0.1/base-configure.in     Sun Dec  2 17:31:51 2001
-@@ -567,14 +567,14 @@
-   GCC_VERSION_CODE="-DGCC_VERSION_CODE=$GCC_VERSION_CODE"
- 
-   echo -n "checking for glibc..."
--  major=`echo '#include <features.h>' |${CC-cc} -E -dM -|awk '/#define.+__GLIBC__/{print $3}'`
-+  major=`echo '#include <features.h>' |${CC-cc} -E -dM -|awk '/#define +__GLIBC__ /{print $3}'`
-   if test "$major" = ""; then
-     echo "no"
-   else
-     if test "$(( $major > 1 ))" = "1"; then
-       GLIBCFLAGS="-D_XOPEN_SOURCE"
-     fi
--    minor=`echo '#include <features.h>' |${CC-cc} -E -dM -|awk '/#define.+__GLIBC_MINOR__/{print $3}'`
-+    minor=`echo '#include <features.h>' |${CC-cc} -E -dM -|awk '/#define +__GLIBC_MINOR__ /{print $3}'`
-     if test "$minor" = ""; then
-       minor=0;
-     fi

diff --git a/dosemu-man-pages.patch b/dosemu-man-pages.patch
deleted file mode 100644 (file)
index 409a871..0000000
--- a/dosemu-man-pages.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -uNr dosemu-1.0.1.old/man/dosdebug.1 dosemu-1.0.1/man/dosdebug.1
---- dosemu-1.0.1.old/man/dosdebug.1    Mon Mar 18 11:43:03 1996
-+++ dosemu-1.0.1/man/dosdebug.1        Sun Nov  4 19:04:27 2001
-@@ -1 +1 @@
--.so man1/dos.1
-+.so dos.1
-diff -uNr dosemu-1.0.1.old/man/dosexec.1 dosemu-1.0.1/man/dosexec.1
---- dosemu-1.0.1.old/man/dosexec.1     Thu Jan  1 01:00:00 1970
-+++ dosemu-1.0.1/man/dosexec.1 Sun Nov  4 19:04:27 2001
-@@ -0,0 +1 @@
-+.so dos.1
-diff -uNr dosemu-1.0.1.old/man/xdos.1 dosemu-1.0.1/man/xdos.1
---- dosemu-1.0.1.old/man/xdos.1        Mon Mar 18 11:43:03 1996
-+++ dosemu-1.0.1/man/xdos.1    Sun Nov  4 19:04:30 2001
-@@ -1 +1 @@
--.so man1/dos.1
-+.so dos.1

diff --git a/dosemu-time.patch b/dosemu-time.patch
deleted file mode 100644 (file)
index a91ed16..0000000
--- a/dosemu-time.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- dosemu-1.0.1/src/dosext/mfs/mfs.c  Sun Mar  5 13:57:37 2000
-+++ dosemu-1.0.1-p/src/dosext/mfs/mfs.c        Tue Jul 17 13:06:13 2001
-@@ -171,6 +171,7 @@
- #include "bios.h"
- #endif
- 
-+#include <time.h>
- #include <stdio.h>
- #include <sys/file.h>
- #include <sys/ioctl.h>
---- dosemu-1.0.1/src/arch/linux/debugger/dosdebug.c    Sat May 20 20:58:12 2000
-+++ dosemu-1.0.1-p/src/arch/linux/debugger/dosdebug.c  Tue Jul 17 13:16:01 2001
-@@ -16,6 +16,7 @@
-  * The switch-console code is from Kevin Buhr <buhr@stat.wisc.edu>
-  */
- 
-+#include <time.h>
- #include <stdlib.h>
- #include <stdio.h>
- #include <sys/time.h>