From 526e7294a38163e182076256b57b331df1b3b5d7 Mon Sep 17 00:00:00 2001 From: rubidium Date: Thu, 15 Sep 2011 19:03:33 +0000 Subject: [PATCH] (svn r22937) [1.1] -Prepare 1.1.3 --- changelog.txt | 17 ++++++++++++----- known-bugs.txt | 4 ++-- os/debian/changelog | 6 ++++++ os/os2/installer/make_installer.cmd | 2 +- os/rpm/openttd.spec | 2 +- os/windows/installer/install.nsi | 4 ++-- readme.txt | 4 ++-- src/ai/api/ai_changelog.hpp | 4 ++++ 8 files changed, 30 insertions(+), 13 deletions(-) diff --git a/changelog.txt b/changelog.txt index 0043c43ec6..cb08c9d1be 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,16 +1,23 @@ +1.1.3 (2011-09-15) +------------------------------------------------------------------------ +- Fix: Prevent authentication bypass for the admin port when a new game is started [FS#4771] (r22934) +- Fix: TTO savegames with any aircraft not in an hangar caused crashes during load (r22915) +- Fix: Windows 2000 and XP without service pack 3 must use the win9x binary/installer; the newer MSVC compiler of the compile farm does not support those versions of Windows anymore [FS#4749] (r22909) + + 1.1.3-RC1 (2011-09-04) ------------------------------------------------------------------------ - Add: River graphics for the original base set (r22766) - Fix: [NewGRF] DCxx text references via the textstack are not allowed, but caused crash [FS#4758] (r22882) - Fix: Harden memory allocation (r22881, r22880, r22875) - Fix: Miscalculation of train curve speed limits (r22879) -- Fix: Validate image dimensions before loading [FS#4747] (r22878, r22877, r22874, r22873) +- Fix: Validate image dimensions before loading [CVE-2011-3343] [FS#4747] (r22878, r22877, r22874, r22873) - Fix: Report an error in the news if autoreplace/renew fails due to the engine type being no longer available [FS#4712] (r22876) -- Fix: Perform stricter checks on RLE compressed BMP images [FS#4746] (r22872, r22871) +- Fix: Perform stricter checks on RLE compressed BMP images [CVE-2011-3343] [FS#4746] (r22872, r22871) - Fix: [NewGRF] Variables 40 and 81 of callback 18 are not the same as 80 (r22867) - Fix: [NewGRF] Generic callbacks shall chain to the next GRF when the callback fails (r22866, r22865) -- Fix: Perform stricter checks on some commands [FS#4745] (r22845) -- Fix: Harden savegame load against too many AI config settings [FS#4748] (r22843) +- Fix: Perform stricter checks on some commands [CVE-2011-3341] [FS#4745] (r22845) +- Fix: Harden savegame load against too many AI config settings [CVE-2011-3342] [FS#4748] (r22843) - Fix: Compilation with GCC 4.7 (r22832, r22728, r22719) - Fix: Allow to demolish aqueducts built in the scenario editor [FS#4741] (r22821) - Fix: Towns expanding from the "wrong" side of a tunnel or bridge [FS#4731] (r22810, r22809) @@ -32,7 +39,7 @@ 1.1.2 (2011-08-14) ------------------------------------------------------------------------ -- Fix: Some corrupted savegames could crash OpenTTD instead of showing the 'savegame corrupted' message [FS#4717] (r22737, r22736) +- Fix: Some corrupted savegames could crash OpenTTD instead of showing the 'savegame corrupted' message [CVE-2011-3342] [FS#4717] (r22737, r22736) - Fix: [NewGRF] Triggering NOT_REACHED when playing with a NewGRF that supplies genders/cases for a language that was not installed [FS#4718] (r22735) diff --git a/known-bugs.txt b/known-bugs.txt index 57bbcf5f05..c1a87d7be5 100644 --- a/known-bugs.txt +++ b/known-bugs.txt @@ -1,6 +1,6 @@ OpenTTD's known bugs -Last updated: 2011-09-04 -Release version: 1.1.3-RC1 +Last updated: 2011-09-15 +Release version: 1.1.3 ------------------------------------------------------------------------ diff --git a/os/debian/changelog b/os/debian/changelog index 0994ba774c..5fd6c74c2b 100644 --- a/os/debian/changelog +++ b/os/debian/changelog @@ -1,3 +1,9 @@ +openttd (1.1.3) unstable; urgency=low + + * New upstream release 1.1.3 + + -- Matthijs Kooijman Thu, 15 Sep 2011 21:00:00 +0200 + openttd (1.1.3-RC1) unstable; urgency=low * New upstream release 1.1.3-RC1 diff --git a/os/os2/installer/make_installer.cmd b/os/os2/installer/make_installer.cmd index dd5cffab18..c19919f112 100644 --- a/os/os2/installer/make_installer.cmd +++ b/os/os2/installer/make_installer.cmd @@ -1,6 +1,6 @@ @echo off -set OPENTTD_VERSION=1.1.3-RC1 +set OPENTTD_VERSION=1.1.3 set OPENSFX_VERSION=0.8.0 set NOSOUND_VERSION=0.8.0 set OPENGFX_VERSION=0.7.0 diff --git a/os/rpm/openttd.spec b/os/rpm/openttd.spec index 14859b2d1e..6e4e30c5a8 100644 --- a/os/rpm/openttd.spec +++ b/os/rpm/openttd.spec @@ -2,7 +2,7 @@ %define binname openttd -%define srcver 1.1.2 +%define srcver 1.1.3 %if %{dedicated} Name: %{binname}-dedicated diff --git a/os/windows/installer/install.nsi b/os/windows/installer/install.nsi index f5937f61a1..b846d06e3a 100644 --- a/os/windows/installer/install.nsi +++ b/os/windows/installer/install.nsi @@ -2,8 +2,8 @@ !define APPV_MAJOR 1 !define APPV_MINOR 1 !define APPV_MAINT 3 -!define APPV_BUILD 0 -!define APPV_EXTRA "-RC1" +!define APPV_BUILD 1 +!define APPV_EXTRA "" !define APPNAME "OpenTTD" ; Define application name !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}" ; Define application version diff --git a/readme.txt b/readme.txt index afc19cd742..2f6bc565f6 100644 --- a/readme.txt +++ b/readme.txt @@ -1,6 +1,6 @@ OpenTTD readme -Last updated: 2011-09-04 -Release version: 1.1.3-RC1 +Last updated: 2011-09-15 +Release version: 1.1.3 ------------------------------------------------------------------------ diff --git a/src/ai/api/ai_changelog.hpp b/src/ai/api/ai_changelog.hpp index 7355cd98aa..40a687f508 100644 --- a/src/ai/api/ai_changelog.hpp +++ b/src/ai/api/ai_changelog.hpp @@ -15,6 +15,10 @@ * functions may still be available if you return an older API version * in GetAPIVersion() in info.nut. * + * \b 1.1.3 + * + * No changes + * * \b 1.1.2 * * No changes