diff --git a/.gitignore b/.gitignore index 97824646..222ea94c 100644 --- a/.gitignore +++ b/.gitignore @@ -35,22 +35,21 @@ .deps .libs Makefile -arm -arm64 -x64 -x86 +/arm +/arm64 +/x64 +/x86 autom4te.cache config.guess -./config.h +/config.h config.log config.status config.sub -cov-int -cov-int.zip depcomp embedded.loc -res/loc/pollock/.vs -res/loc/pollock/bin -res/loc/pollock/obj -rufus_files +/res/loc/pollock/.vs +/res/loc/pollock/bin +/res/loc/pollock/obj +/rufus_files stamp-h1 +/.vs/rufus diff --git a/README.md b/README.md index c5514e46..663df4ce 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Features -------- * Format USB, flash card and virtual drives to FAT/FAT32/NTFS/UDF/exFAT/ReFS/ext2/ext3 -* Create DOS bootable USB drives using [FreeDOS](https://www.freedos.org) +* Create DOS bootable USB drives using [FreeDOS](https://www.freedos.org) or MS-DOS * Create BIOS or UEFI bootable drives, including [UEFI bootable NTFS](https://github.com/pbatard/uefi-ntfs) * Create bootable drives from bootable ISOs (Windows, Linux, etc.) * Create bootable drives from bootable disk images, including compressed ones diff --git a/configure b/configure index 9a45eb61..5dad70db 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for rufus 4.0. +# Generated by GNU Autoconf 2.71 for rufus 4.1. # # Report bugs to . # @@ -611,8 +611,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='rufus' PACKAGE_TARNAME='rufus' -PACKAGE_VERSION='4.0' -PACKAGE_STRING='rufus 4.0' +PACKAGE_VERSION='4.1' +PACKAGE_STRING='rufus 4.1' PACKAGE_BUGREPORT='https://github.com/pbatard/rufus/issues' PACKAGE_URL='https://rufus.ie' @@ -1269,7 +1269,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 4.0 to adapt to many kinds of systems. +\`configure' configures rufus 4.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1336,7 +1336,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of rufus 4.0:";; + short | recursive ) echo "Configuration of rufus 4.1:";; esac cat <<\_ACEOF @@ -1428,7 +1428,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -rufus configure 4.0 +rufus configure 4.1 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -1504,7 +1504,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 4.0, which was +It was created by rufus $as_me 4.1, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -2767,7 +2767,7 @@ fi # Define the identity of the package. PACKAGE='rufus' - VERSION='4.0' + VERSION='4.1' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -5309,7 +5309,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 4.0, which was +This file was extended by rufus $as_me 4.1, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5365,7 +5365,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -rufus config.status 4.0 +rufus config.status 4.1 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 6d685284..d3d4af69 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([rufus], [4.0], [https://github.com/pbatard/rufus/issues], [rufus], [https://rufus.ie]) +AC_INIT([rufus], [4.1], [https://github.com/pbatard/rufus/issues], [rufus], [https://rufus.ie]) AM_INIT_AUTOMAKE([-Wno-portability foreign no-dist no-dependencies]) AC_CONFIG_SRCDIR([src/rufus.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/res/uefi/readme.txt b/res/uefi/readme.txt index c49b67af..5c84f2a2 100644 --- a/res/uefi/readme.txt +++ b/res/uefi/readme.txt @@ -7,7 +7,7 @@ This image, which can be mounted as a FAT file system or opened in 7-zip, contains the following data: o Secure Boot signed NTFS UEFI drivers, derived from ntfs-3g [1]. - These drivers are the exact same as the read-only binaries from release 1.5, + These drivers are the exact same as the read-only binaries from release 1.6, except for the addition of Microsoft's Secure Boot signature. Note that, per Microsoft's current Secure Boot signing policies, the 32-bit ARM driver (ntfs_arm.efi) is not Secure Boot signed. diff --git a/res/uefi/uefi-ntfs.img b/res/uefi/uefi-ntfs.img index 491b38ad..f8981512 100644 Binary files a/res/uefi/uefi-ntfs.img and b/res/uefi/uefi-ntfs.img differ diff --git a/src/rufus.rc b/src/rufus.rc index efe4cebc..719ef5ea 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 232, 326 STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_ACCEPTFILES -CAPTION "Rufus 4.0.2040" +CAPTION "Rufus 4.1.2041" FONT 9, "Segoe UI Symbol", 400, 0, 0x0 BEGIN LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP @@ -392,8 +392,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,0,2040,0 - PRODUCTVERSION 4,0,2040,0 + FILEVERSION 4,1,2041,0 + PRODUCTVERSION 4,1,2041,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -411,13 +411,13 @@ BEGIN VALUE "Comments", "https://rufus.ie" VALUE "CompanyName", "Akeo Consulting" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "4.0.2040" + VALUE "FileVersion", "4.1.2041" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2023 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" - VALUE "OriginalFilename", "rufus-4.0.exe" + VALUE "OriginalFilename", "rufus-4.1.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "4.0.2040" + VALUE "ProductVersion", "4.1.2041" END END BLOCK "VarFileInfo"