From 204908f8e00053d5b007e25de7dab1d3f926b8de Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Mon, 24 Sep 2018 23:42:04 +0100 Subject: [PATCH] [misc] enable MinGW reproducible builds * -Wl,--no-insert-timestamp seems to do the trick * Also set rufus-next to 3.4 --- configure | 22 +++++++++++----------- configure.ac | 4 ++-- res/appstore/AppxManifest.xml | 2 +- res/appstore/packme.cmd | 2 +- src/format.c | 2 +- src/rufus.rc | 12 ++++++------ 6 files changed, 22 insertions(+), 22 deletions(-) diff --git a/configure b/configure index 795026be..ed09b974 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.69 for rufus 3.3. +# Generated by GNU Autoconf 2.69 for rufus 3.4. # # Report bugs to . # @@ -580,8 +580,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='rufus' PACKAGE_TARNAME='rufus' -PACKAGE_VERSION='3.3' -PACKAGE_STRING='rufus 3.3' +PACKAGE_VERSION='3.4' +PACKAGE_STRING='rufus 3.4' PACKAGE_BUGREPORT='https://github.com/pbatard/rufus/issues' PACKAGE_URL='https://rufus.ie' @@ -1228,7 +1228,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 3.3 to adapt to many kinds of systems. +\`configure' configures rufus 3.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1294,7 +1294,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of rufus 3.3:";; + short | recursive ) echo "Configuration of rufus 3.4:";; esac cat <<\_ACEOF @@ -1385,7 +1385,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -rufus configure 3.3 +rufus configure 3.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1440,7 +1440,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 3.3, which was +It was created by rufus $as_me 3.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2303,7 +2303,7 @@ fi # Define the identity of the package. PACKAGE='rufus' - VERSION='3.3' + VERSION='3.4' cat >>confdefs.h <<_ACEOF @@ -3815,7 +3815,7 @@ $as_echo "#define _GNU_SOURCE /**/" >>confdefs.h AM_CFLAGS="${AM_CFLAGS} -DWINVER=0x601 -D_WIN32_WINNT=0x601 -D_WIN32_IE=0x800" # "-Wl,--nxcompat" to enable DEP (Data Execution Prevention) -AM_LDFLAGS="${AM_LDFLAGS} -Wl,-no-undefined -Wl,--nxcompat" +AM_LDFLAGS="${AM_LDFLAGS} -Wl,-no-undefined -Wl,--nxcompat -Wl,--no-insert-timestamp" # Debug symbols # Check whether --enable-debug was given. @@ -4481,7 +4481,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 3.3, which was +This file was extended by rufus $as_me 3.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -4535,7 +4535,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 3.3 +rufus config.status 3.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 9e47e09d..44372d10 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([rufus], [3.3], [https://github.com/pbatard/rufus/issues], [rufus], [https://rufus.ie]) +AC_INIT([rufus], [3.4], [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]) @@ -19,7 +19,7 @@ AC_DEFINE([_GNU_SOURCE], [], [Use GNU extensions]) AM_CFLAGS="${AM_CFLAGS} -DWINVER=0x601 -D_WIN32_WINNT=0x601 -D_WIN32_IE=0x800" # "-Wl,--nxcompat" to enable DEP (Data Execution Prevention) -AM_LDFLAGS="${AM_LDFLAGS} -Wl,-no-undefined -Wl,--nxcompat" +AM_LDFLAGS="${AM_LDFLAGS} -Wl,-no-undefined -Wl,--nxcompat -Wl,--no-insert-timestamp" # Debug symbols AC_ARG_ENABLE([debug], diff --git a/res/appstore/AppxManifest.xml b/res/appstore/AppxManifest.xml index f812779a..d2a19c93 100644 --- a/res/appstore/AppxManifest.xml +++ b/res/appstore/AppxManifest.xml @@ -8,7 +8,7 @@ for an interesting struggle, when you also happen to have a comma in one of the fields... --> diff --git a/res/appstore/packme.cmd b/res/appstore/packme.cmd index 7d1d42bc..dedde8d9 100644 --- a/res/appstore/packme.cmd +++ b/res/appstore/packme.cmd @@ -1,5 +1,5 @@ @echo off -set VERSION=3.3 +set VERSION=3.4 rem Make sure you don't have anything you don't want included in the package, as anything residing in the rem current directory will be included, including any previous .appx, which makes for nice recursion... diff --git a/src/format.c b/src/format.c index 704e6ff3..daeac7c2 100644 --- a/src/format.c +++ b/src/format.c @@ -863,7 +863,7 @@ static BOOL ClearMBRGPT(HANDLE hPhysicalDrive, LONGLONG DiskSize, DWORD SectorSi Sleep(WRITE_TIMEOUT); } else { // Windows seems to be an ass about keeping a lock on a backup GPT, - // so we try to be lenient about about not being able to clear it. + // so we try to be lenient about not being able to clear it. uprintf("Warning: Failed to clear backup GPT..."); r = TRUE; goto out; diff --git a/src/rufus.rc b/src/rufus.rc index 5e9369ee..d1733b8b 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 3.3.1401" +CAPTION "Rufus 3.4.1402" 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 3,3,1401,0 - PRODUCTVERSION 3,3,1401,0 + FILEVERSION 3,4,1402,0 + PRODUCTVERSION 3,4,1402,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -411,13 +411,13 @@ BEGIN VALUE "Comments", "https://akeo.ie" VALUE "CompanyName", "Akeo Consulting" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "3.3.1401" + VALUE "FileVersion", "3.4.1402" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "https://www.gnu.org/copyleft/gpl.html" - VALUE "OriginalFilename", "rufus-3.3.exe" + VALUE "OriginalFilename", "rufus-3.4.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "3.3.1401" + VALUE "ProductVersion", "3.4.1402" END END BLOCK "VarFileInfo"