[Pkg-nagios-changes] [pkg-icinga2] 01/03: New upstream version 2.6.2

[Alexander Wirt]

This is an automated email from the git hooks/post-receive script.

formorer pushed a commit to branch master
in repository pkg-icinga2.

commit 7eee4790277950dcdf2a2a5eca44fcef844bd569
Author: Alexander Wirt <alexander.wirt at credativ.de>
Date:   Mon Feb 13 20:50:29 2017 +0100

    New upstream version 2.6.2
---
 ChangeLog                 | 11 +++++++++++
 RELEASE.md                | 39 ++++++---------------------------------
 doc/1-about.md            | 11 +++++++++++
 icinga2.spec              |  2 +-
 lib/config/configitem.cpp | 13 +++----------
 5 files changed, 32 insertions(+), 44 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8dbed58..8439359 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,17 @@ Please check [doc/1-about.md].
 
 ## What's New
 
+### What's New in Version 2.6.2
+
+#### Changes
+
+This is a bugfix release which addresses a crash that can occur when removing
+configuration files for objects which have been deleted via the API.
+
+#### Bugfixes
+
+* Bug 4952 (API): Icinga crashes while trying to remove configuration files for objects which no longer exist
+
 ### What's New in Version 2.6.1
 
 #### Changes
diff --git a/RELEASE.md b/RELEASE.md
index 7a2c1d1..63bbd9c 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -4,7 +4,7 @@ Print this document.
 
 Specify the release version.
 
-    VERSION=2.6.1
+    VERSION=2.6.2
 
 ## Issues
 
@@ -12,22 +12,8 @@ Check issues at https://github.com/Icinga/icinga2
 
 ## Backport Commits
 
-    $ git checkout master
-    $ ./pick.py -V $VERSION
-
-The script creates a new branch 'auto-merged-<VERSION>' 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.6
-    $ git merge --ff-only auto-merged-2.6.1
+For minor versions you need to manually backports any and all commits from the
+master branch which should be part of this release.
 
 ## Authors
 
@@ -48,21 +34,8 @@ Example:
 
 ## Changelog
 
-Update the [ChangeLog](ChangeLog), [doc/1-about.md](doc/1-about.md) files using
-the changelog.py script. Also generate HTML for the wordpress release announcement.
-You need to copy and paste the output manually.
-
-Changelog:
-
-    $ ./changelog.py -V $VERSION
-
-Docs:
-
-    $ ./changelog.py -V $VERSION -l
-
-Wordpress:
-
-    $ ./changelog.py -V $VERSION -H -l
+Update the [ChangeLog](ChangeLog), [doc/1-about.md](doc/1-about.md) files. Also generate HTML
+for the wordpress release announcement.
 
 ## Git Tag
 
@@ -146,7 +119,7 @@ Create the nupkg package:
 
 Install the created icinga2 package locally:
 
-    choco install icinga2 -version 2.6.1 -fdv "%cd%" -source "'%cd%;https://chocolatey.org/api/v2/'"
+    choco install icinga2 -version 2.6.2 -fdv "%cd%" -source "'%cd%;https://chocolatey.org/api/v2/'"
 
 Upload the package to [chocolatey](https://chocolatey.org/packages/upload).
 
diff --git a/doc/1-about.md b/doc/1-about.md
index 7b466bb..4a1ba37 100644
--- a/doc/1-about.md
+++ b/doc/1-about.md
@@ -44,6 +44,17 @@ file.
 
 ## <a id="whats-new"></a> What's New
 
+### What's New in Version 2.6.2
+
+#### Changes
+
+This is a bugfix release which addresses a crash that can occur when removing
+configuration files for objects which have been deleted via the API.
+
+#### Bugfixes
+
+* Bug 4952 (API): Icinga crashes while trying to remove configuration files for objects which no longer exist
+
 ### What's New in Version 2.6.1
 
 #### Changes
diff --git a/icinga2.spec b/icinga2.spec
index e4ff1ce..2204d60 100644
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -66,7 +66,7 @@
 
 Summary: Network monitoring application
 Name: icinga2
-Version: 2.6.1
+Version: 2.6.2
 Release: %{revision}%{?dist}
 License: GPL-2.0+
 Group: Applications/System
diff --git a/lib/config/configitem.cpp b/lib/config/configitem.cpp
index 4bafd3d..86f3118 100644
--- a/lib/config/configitem.cpp
+++ b/lib/config/configitem.cpp
@@ -657,8 +657,7 @@ std::vector<ConfigItem::Ptr> ConfigItem::GetItems(const String& type)
 
 	items.reserve(it->second.size());
 
-	for (const ItemMap::value_type& kv : it->second)
-	{
+	for (const ItemMap::value_type& kv : it->second) {
 		items.push_back(kv.second);
 	}
 
@@ -678,8 +677,7 @@ std::vector<ConfigItem::Ptr> ConfigItem::GetDefaultTemplates(const String& type)
 
 	items.reserve(it->second.size());
 
-	for (const ItemMap::value_type& kv : it->second)
-	{
+	for (const ItemMap::value_type& kv : it->second) {
 		items.push_back(kv.second);
 	}
 
@@ -697,12 +695,7 @@ void ConfigItem::RemoveIgnoredItems(const String& allowedConfigPath)
 		Log(LogNotice, "ConfigItem")
 		    << "Removing ignored item path '" << path << "'.";
 
-		if (unlink(path.CStr()) < 0) {
-			BOOST_THROW_EXCEPTION(posix_error()
-			    << boost::errinfo_api_function("unlink")
-			    << boost::errinfo_errno(errno)
-			    << boost::errinfo_file_name(path));
-		}
+		(void) unlink(path.CStr());
 	}
 
 	m_IgnoredItems.clear();

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icinga2.git