[freedos] update FreeDOS resources to latest version

* also update version to rufus-next

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for rufus 1.1.3.
+# Generated by GNU Autoconf 2.68 for rufus 1.1.4.
 #
 # Report bugs to <https://github.com/pbatard/rufus/issues>.
 #
@@ -559,8 +559,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='rufus'
 PACKAGE_TARNAME='rufus'
-PACKAGE_VERSION='1.1.3'
-PACKAGE_STRING='rufus 1.1.3'
+PACKAGE_VERSION='1.1.4'
+PACKAGE_STRING='rufus 1.1.4'
 PACKAGE_BUGREPORT='https://github.com/pbatard/rufus/issues'
 PACKAGE_URL='http://rufus.akeo.ie'
 
@@ -1204,7 +1204,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures rufus 1.1.3 to adapt to many kinds of systems.
+\`configure' configures rufus 1.1.4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1270,7 +1270,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of rufus 1.1.3:";;
+     short | recursive ) echo "Configuration of rufus 1.1.4:";;
    esac
   cat <<\_ACEOF
 
@@ -1363,7 +1363,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-rufus configure 1.1.3
+rufus configure 1.1.4
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1418,7 +1418,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by rufus $as_me 1.1.3, which was
+It was created by rufus $as_me 1.1.4, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2233,7 +2233,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='rufus'
- VERSION='1.1.3'
+ VERSION='1.1.4'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -4091,7 +4091,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by rufus $as_me 1.1.3, which was
+This file was extended by rufus $as_me 1.1.4, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4145,7 +4145,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-rufus config.status 1.1.3
+rufus config.status 1.1.4
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([rufus], [1.1.3], [https://github.com/pbatard/rufus/issues], [rufus], [http://rufus.akeo.ie])
+AC_INIT([rufus], [1.1.4], [https://github.com/pbatard/rufus/issues], [rufus], [http://rufus.akeo.ie])
 AM_INIT_AUTOMAKE([-Wno-portability foreign no-dist no-dependencies])
 AC_CONFIG_SRCDIR([src/rufus.c])
 AC_CONFIG_MACRO_DIR([m4])

res/freedos/readme.txt

@@ -1,5 +1,9 @@
-o COMMAND.COM file was extracted from the fd11tst3.img image available at:
-  http://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/distributions/1.1-test3/
+o KERNEL.SYS was extracted from ke2041_386f32.zip available at:
+  https://sourceforge.net/projects/freedos/files/Kernel/2041/
+  It was modified to have FORCELBA enabled (byte offset 0x0D set to 0x01)
+
+o COMMAND.COM was extracted from the fd11src.iso -> ISOLINUX\FDBOOT.IMG at:
+  http://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/distributions/1.1/
 
 o The EGA files were extracted from the cpidos30.zip available at:
   http://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/dos/cpi/
@@ -10,37 +14,8 @@ o DISPLAY.EXE was extracted from /disp013x.zip available at:
 o KEYB.EXE was extracted from KEYB201.ZIP available at:
   http://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/dos/keyb/2.01/
   
-o The keyboard layouts (KEYB___.SYS) were extracted from kpdos30x.zip:
+o The keyboard layouts (KEYB___.SYS) were extracted from kpdos31x.zip:
   http://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/dos/keyb/kblayout/
 
 o MODE.COM was extracted from mode-2005may12.zip available at:
   http://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/dos/mode/2005/
-
-o Because of issue #19 (see https://github.com/pbatard/rufus/issues/19)
-  KERNEL.SYS is a recompiled version, from the 2011.12.16 svn source, with
-  FORCELBA enabled and with the following patch having been applied:
-
-Index: kernel/initdisk.c
-===================================================================
---- kernel/initdisk.c	(revision 1696)
-+++ kernel/initdisk.c	(working copy)
-@@ -810,10 +810,13 @@
- void print_warning_suspect(char *partitionName, UBYTE fs, struct CHS *chs,
-                            struct CHS *pEntry_chs)
- {
--  printf("WARNING: using suspect partition %s FS %02x:", partitionName, fs);
--  printCHS(" with calculated values ", chs);
--  printCHS(" instead of ", pEntry_chs);
--  printf("\n");
-+  if (!InitKernelConfig.ForceLBA)
-+  {
-+    printf("WARNING: using suspect partition %s FS %02x:", partitionName, fs);
-+    printCHS(" with calculated values ", chs);
-+    printCHS(" instead of ", pEntry_chs);
-+    printf("\n");
-+  }
-   memcpy(pEntry_chs, chs, sizeof(struct CHS));
- }
-
-Recompilation was done using Open Watcom, as described at:
-http://pete.akeo.ie/2011/12/compiling-freedos-on-windows-using.html

src/rufus.rc

@@ -33,7 +33,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 IDD_DIALOG DIALOGEX 12, 12, 206, 289
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 EXSTYLE WS_EX_APPWINDOW
-CAPTION "Rufus v1.1.3.146"
+CAPTION "Rufus v1.1.4.147"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     DEFPUSHBUTTON   "Start",IDC_START,94,248,50,14
@@ -73,7 +73,7 @@ BEGIN
     DEFPUSHBUTTON   "OK",IDOK,231,175,50,14,WS_GROUP
     CONTROL         "<a href=""http://rufus.akeo.ie"">http://rufus.akeo.ie</a>",IDC_ABOUT_RUFUS_URL,
                     "SysLink",WS_TABSTOP,46,47,114,9
-    LTEXT           "Version 1.1.3 (Build 146)",IDC_STATIC,46,19,78,8
+    LTEXT           "Version 1.1.4 (Build 147)",IDC_STATIC,46,19,78,8
     PUSHBUTTON      "License...",IDC_ABOUT_LICENSE,46,175,50,14,WS_GROUP
     EDITTEXT        IDC_ABOUT_COPYRIGHTS,46,107,235,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL
     LTEXT           "Report bugs or request enhancements at:",IDC_STATIC,46,66,187,8
@@ -223,8 +223,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,1,3,146
- PRODUCTVERSION 1,1,3,146
+ FILEVERSION 1,1,4,147
+ PRODUCTVERSION 1,1,4,147
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -241,13 +241,13 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "akeo.ie"
             VALUE "FileDescription", "Rufus"
-            VALUE "FileVersion", "1.1.3.146"
+            VALUE "FileVersion", "1.1.4.147"
             VALUE "InternalName", "Rufus"
             VALUE "LegalCopyright", "© 2011 Pete Batard (GPL v3)"
             VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
             VALUE "OriginalFilename", "rufus.exe"
             VALUE "ProductName", "Rufus"
-            VALUE "ProductVersion", "1.1.3.146"
+            VALUE "ProductVersion", "1.1.4.147"
         END
     END
     BLOCK "VarFileInfo"