diff --git a/res/Tools_Misc_A.qrc b/res/Tools_Misc_A.qrc index 4bd5185b..8479c547 100644 --- a/res/Tools_Misc_A.qrc +++ b/res/Tools_Misc_A.qrc @@ -3,7 +3,7 @@ tools/elevator.exe tools/gpgv.exe - tools/gpgv.gpg + tools/keyring.gpg tools/sox.exe tools/tag.exe tools/wget.exe diff --git a/res/tools/gpgv.gpg b/res/tools/gpgv.gpg deleted file mode 100644 index 8ac5f577..00000000 Binary files a/res/tools/gpgv.gpg and /dev/null differ diff --git a/res/tools/keyring.gpg b/res/tools/keyring.gpg new file mode 100644 index 00000000..0ad2139e Binary files /dev/null and b/res/tools/keyring.gpg differ diff --git a/src/Config.h b/src/Config.h index 59e4bc02..6317ee99 100644 --- a/src/Config.h +++ b/src/Config.h @@ -35,7 +35,7 @@ #define VER_LAMEXP_MINOR_LO 2 #define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_PATCH 4 -#define VER_LAMEXP_BUILD 1787 +#define VER_LAMEXP_BUILD 1790 #define VER_LAMEXP_CONFG 1700 /////////////////////////////////////////////////////////////////////////////// diff --git a/src/Dialog_Update.cpp b/src/Dialog_Update.cpp index 6558cdbc..24fd7e62 100644 --- a/src/Dialog_Update.cpp +++ b/src/Dialog_Update.cpp @@ -85,7 +85,7 @@ UpdateDialog::UpdateDialog(const SettingsModel *const settings, QWidget *parent) m_binaryUpdater(lamexp_tools_lookup("wupdate.exe")), m_binaryWGet(lamexp_tools_lookup("wget.exe")), m_binaryGnuPG(lamexp_tools_lookup("gpgv.exe")), - m_binaryKeys(lamexp_tools_lookup("gpgv.gpg")) + m_binaryKeys(lamexp_tools_lookup("keyring.gpg")) { if(m_binaryUpdater.isEmpty()) { diff --git a/src/Tools.h b/src/Tools.h index 9b9044e2..0f7044b9 100644 --- a/src/Tools.h +++ b/src/Tools.h @@ -67,7 +67,7 @@ g_lamexp_tools[] = {"36f9b021a8136664fce4c556571270f9151ca11d191b31630b0cad7b28107be2175909b8d28c903cb1c17d260c38d5de", CPU_TYPE_X86_ALL, "flac.i386.exe", 131, ""}, {"68e08fc34f981d183f243308791b5e158c28903a2052ca239bb9ad3d54d976c9ec7f0bb0b50c0aadfcefb4a1d0f63a18", CPU_TYPE_X64_ALL, "flac.x64.exe" , 131, ""}, {"9d2008d06b731b0d88377e9b2ceda30826ee787fe09ae8ef98084d5ef80655199e5069672366314b67a4285b56a282f0", CPU_TYPE_ALL_ALL, "gpgv.exe", 1419, ""}, - {"19c9dbe9089491c1f59ae48016d95d4336c4d3743577db4e782d8b59eca3b2bda6ed8f92f9004f88f434935b79e4974b", CPU_TYPE_ALL_ALL, "gpgv.gpg", UINT_MAX, ""}, + {"c66992384b6388a7b68f2659624c150b33ff1cacb0c28c0ab2a3249eca4c31e204953f325403f78c077d1735b275ac12", CPU_TYPE_ALL_ALL, "keyring.gpg", UINT_MAX, ""}, {"53cfab3896a47d48f523315f475fa07856d468ad1aefcc8cce19c18cdf509e2f92840dab92a442995df36d941cb7a6ca", CPU_TYPE_ALL_GEN, "lame.i386.exe", 3995, "Final"}, {"9511e7ef2ad10de05386eedf7f14d637edab894a53dacd2f8f15c6f8ed582f12c25fb5bf88438e62c46b8eb92e7634b2", CPU_TYPE_ALL_SSE, "lame.sse2.exe", 3995, "Final"}, {"fdbeb978025b9a5345300f37bb56446c31c7db594cf29407afdcc9ce20f4a5cec6eb8c03962c247d4f45b83c465ac705", CPU_TYPE_ALL_ALL, "mac.exe", 412, ""},