From cf34aa80f550238f1cba59858cc893194308c859 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 21 Apr 2016 09:17:40 +0200 Subject: [PATCH 1/3] Fix crash in Ido{Mysql,Pgsql}Connection::ExecuteMultipleQueries fixes #11639 --- lib/db_ido_mysql/idomysqlconnection.cpp | 3 ++- lib/db_ido_pgsql/idopgsqlconnection.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/db_ido_mysql/idomysqlconnection.cpp b/lib/db_ido_mysql/idomysqlconnection.cpp index acfa1841e..56c2767a8 100644 --- a/lib/db_ido_mysql/idomysqlconnection.cpp +++ b/lib/db_ido_mysql/idomysqlconnection.cpp @@ -775,7 +775,8 @@ void IdoMysqlConnection::ExecuteQuery(const DbQuery& query) void IdoMysqlConnection::ExecuteMultipleQueries(const std::vector& queries) { - ASSERT(!queries.empty()); + if (queries.empty()) + return; m_QueryQueue.Enqueue(boost::bind(&IdoMysqlConnection::InternalExecuteMultipleQueries, this, queries), queries[0].Priority, true); } diff --git a/lib/db_ido_pgsql/idopgsqlconnection.cpp b/lib/db_ido_pgsql/idopgsqlconnection.cpp index c1b7295b1..a55f5fa64 100644 --- a/lib/db_ido_pgsql/idopgsqlconnection.cpp +++ b/lib/db_ido_pgsql/idopgsqlconnection.cpp @@ -654,7 +654,8 @@ void IdoPgsqlConnection::ExecuteQuery(const DbQuery& query) void IdoPgsqlConnection::ExecuteMultipleQueries(const std::vector& queries) { - ASSERT(!queries.empty()); + if (queries.empty()) + return; m_QueryQueue.Enqueue(boost::bind(&IdoPgsqlConnection::InternalExecuteMultipleQueries, this, queries), queries[0].Priority, true); } From 3c8e0fe013134679ba9f7c1419fe68319514c2e2 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 21 Apr 2016 09:51:11 +0200 Subject: [PATCH 2/3] Update RELEASE.md refs #11638 --- RELEASE.md | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/RELEASE.md b/RELEASE.md index 1561c8779..65ef0c929 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -11,14 +11,28 @@ Check the following issue filters: ## Backport Commits + $ git checkout master $ ./pick.py -V 2.4.6 -Verify the created branch and replace it into the current support branch. +The script creates a new branch 'auto-merged-2.4.6' which is based on the +current support branch. It then merges all commits from the 'master' branch which +reference a ticket for the version that was specified. + +If there are any merge commits you will need to manually fix them and continue the +rebase until no commits are left: + + $ git rebase --continue + +After finishing the rebase the branch needs to be merged into the support branch: + + $ git checkout support/2.4 + $ git merge --ff-only auto-merged-2.4.6 ## Authors Update the [.mailmap](.mailmap) and [AUTHORS](AUTHORS) files: + $ git checkout master $ git log --use-mailmap | grep ^Author: | cut -f2- -d' ' | sort | uniq > AUTHORS ## Version @@ -27,7 +41,7 @@ Update the version number in the following files: * [icinga2.spec]: Version: (.*) * [icinga2.nuspec]: (.*) -* [tools/chocolateyInstall.ps1]: Icinga2-v(.*).exe +* [tools/chocolateyInstall.ps1]: Icinga2-v(.*)-{x86,x86_64}.msi ## Changelog From 941e488fb137fe8c8ff68724fa5d66d79a476435 Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 21 Apr 2016 12:32:26 +0200 Subject: [PATCH 3/3] Release version 2.4.7 --- ChangeLog | 6 ++++++ RELEASE.md | 12 ++++++------ doc/1-about.md | 6 ++++++ icinga2.nuspec | 2 +- icinga2.spec | 2 +- tools/chocolateyInstall.ps1 | 4 ++-- 6 files changed, 22 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index a6e911ee7..9d6410925 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,12 @@ Please check [doc/1-about.md]. ## What's New +### What's New in Version 2.4.7 + +#### Bugfixes + +* Bug 11639: Crash in IdoMysqlConnection::ExecuteMultipleQueries + ### What's New in Version 2.4.6 #### Feature diff --git a/RELEASE.md b/RELEASE.md index 65ef0c929..0b21f2ed4 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -12,9 +12,9 @@ Check the following issue filters: ## Backport Commits $ git checkout master - $ ./pick.py -V 2.4.6 + $ ./pick.py -V 2.4.7 -The script creates a new branch 'auto-merged-2.4.6' which is based on the +The script creates a new branch 'auto-merged-2.4.7' which is based on the current support branch. It then merges all commits from the 'master' branch which reference a ticket for the version that was specified. @@ -26,7 +26,7 @@ rebase until no commits are left: After finishing the rebase the branch needs to be merged into the support branch: $ git checkout support/2.4 - $ git merge --ff-only auto-merged-2.4.6 + $ git merge --ff-only auto-merged-2.4.7 ## Authors @@ -50,15 +50,15 @@ the changelog.py script. Also generate HTML for the wordpress release announceme Changelog: - $ ./changelog.py -V 2.4.6 + $ ./changelog.py -V 2.4.7 Docs: - $ ./changelog.py -V 2.4.6 -l + $ ./changelog.py -V 2.4.7 -l Wordpress: - $ ./changelog.py -V 2.4.6 -H -l + $ ./changelog.py -V 2.4.7 -H -l ## Git Tag diff --git a/doc/1-about.md b/doc/1-about.md index 1b7c5e384..ee9e02b31 100644 --- a/doc/1-about.md +++ b/doc/1-about.md @@ -54,6 +54,12 @@ More details in the [Icinga FAQ](https://www.icinga.org/icinga/faq/). ## What's New +### What's New in Version 2.4.7 + +#### Bugfixes + +* Bug [11639](https://dev.icinga.org/issues/11639 "Bug 11639"): Crash in IdoMysqlConnection::ExecuteMultipleQueries + ### What's New in Version 2.4.6 #### Feature diff --git a/icinga2.nuspec b/icinga2.nuspec index dc802c95f..45398aba5 100755 --- a/icinga2.nuspec +++ b/icinga2.nuspec @@ -6,7 +6,7 @@ icinga2 Icinga2 - 2.4.6 + 2.4.7 2016 - The Icinga Project Icinga Development Team icinga2 - Monitoring Agent for Windows diff --git a/icinga2.spec b/icinga2.spec index a7e18f966..3f6c980ba 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -66,7 +66,7 @@ Summary: Network monitoring application Name: icinga2 -Version: 2.4.6 +Version: 2.4.7 Release: %{revision}%{?dist} License: GPL-2.0+ Group: Applications/System diff --git a/tools/chocolateyInstall.ps1 b/tools/chocolateyInstall.ps1 index dd4346d4b..ad5a282ca 100755 --- a/tools/chocolateyInstall.ps1 +++ b/tools/chocolateyInstall.ps1 @@ -1,7 +1,7 @@ $packageName = 'icinga2' $installerType = 'msi' -$url32 = 'http://packages.icinga.org/windows/Icinga2-v2.4.6-x86.msi' -$url64 = 'http://packages.icinga.org/windows/Icinga2-v2.4.6-x86_64.msi' +$url32 = 'http://packages.icinga.org/windows/Icinga2-v2.4.7-x86.msi' +$url64 = 'http://packages.icinga.org/windows/Icinga2-v2.4.7-x86_64.msi' $silentArgs = '/silent' $validExitCodes = @(0)