[Pkg-nagios-changes] [pkg-icinga2] 01/04: Imported Upstream version 2.4.6
Alexander Wirt
formorer at debian.org
Thu Apr 21 16:34:07 UTC 2016
This is an automated email from the git hooks/post-receive script.
formorer pushed a commit to branch debmon-jessie
in repository pkg-icinga2.
commit 6935d4a356543fed0861d20e7950d963f8db4b1c
Author: Alexander Wirt <formorer at debian.org>
Date: Wed Apr 20 18:57:13 2016 +0200
Imported Upstream version 2.4.6
---
ChangeLog | 12 ++++++++++++
RELEASE.md | 32 +++++++++++++++++++-------------
doc/1-about.md | 12 ++++++++++++
doc/6-object-types.md | 2 +-
icinga2.nuspec | 2 +-
icinga2.spec | 2 +-
lib/db_ido_pgsql/idopgsqlconnection.cpp | 3 ++-
third-party/cmake/FindMySQL.cmake | 25 ++++++++++++++++++++-----
tools/chocolateyInstall.ps1 | 4 ++--
9 files changed, 70 insertions(+), 24 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index b4b5d1e..a6e911e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,18 @@ Please check [doc/1-about.md].
## What's New
+### What's New in Version 2.4.6
+
+#### Feature
+
+* Feature 11638: Update RELEASE.md
+
+#### Bugfixes
+
+* Bug 11628: Docs: Zone attribute 'endpoints' is an array
+* Bug 11634: Icinga 2 fails to build on Ubuntu Xenial
+* Bug 11635: Failed assertion in IdoPgsqlConnection::FieldToEscapedString
+
### What's New in Version 2.4.5
#### Changes
diff --git a/RELEASE.md b/RELEASE.md
index 950017b..1561c87 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -9,6 +9,12 @@ Check the following issue filters:
* [Pending backports](https://dev.icinga.org/projects/i2/issues?query_id=41)
* [Invalid target version](https://dev.icinga.org/projects/i2/issues?query_id=55)
+## Backport Commits
+
+ $ ./pick.py -V 2.4.6
+
+Verify the created branch and replace it into the current support branch.
+
## Authors
Update the [.mailmap](.mailmap) and [AUTHORS](AUTHORS) files:
@@ -30,15 +36,15 @@ the changelog.py script. Also generate HTML for the wordpress release announceme
Changelog:
- $ ./changelog.py --version 2.4.5 --project i2
+ $ ./changelog.py -V 2.4.6
Docs:
- $ ./changelog.py --version 2.4.5 --project i2 --links
+ $ ./changelog.py -V 2.4.6 -l
Wordpress:
- $ ./changelog.py --version 2.4.5 --project i2 --html --links
+ $ ./changelog.py -V 2.4.6 -H -l
## Git Tag
@@ -83,16 +89,20 @@ into master and merge the support branch:
## Build Server
* Update Git tags for the release jobs.
+* Build the newly created Git tag for Debian/RHEL/SuSE.
+* Build the newly created Git tag for Windows.
-### Linux
+## Release Tests
-* Build the newly created Git tag for Debian/RHEL/SuSE.
+* Test DB IDO with MySQL and PostgreSQL.
* Provision the vagrant boxes and test the release packages.
-* Start a new docker container and install/run icinga2
+* Test the [setup wizard](http://packages.icinga.org/windows/) inside a Windows VM.
+
+* Start a new docker container and install/run icinga2.
Example for CentOS7:
- $ sudo docker run -ti centos:latest bash
+ $ docker run -ti centos:latest bash
# yum -y install http://packages.icinga.org/epel/7/release/noarch/icinga-rpm-release-7-1.el7.centos.noarch.rpm
# yum -y install icinga2
@@ -101,11 +111,6 @@ Example for CentOS7:
# systemctl start icinga2
# tail -f /var/log/icinga2/icinga2.log
-### Windows
-
-* Build the newly created Git tag for Windows.
-* Test the [setup wizard](http://packages.icinga.org/windows/) inside a Windows VM.
-
## GitHub Release
Create a new release for the newly created Git tag.
@@ -114,7 +119,7 @@ https://github.com/Icinga/icinga2/releases
## Online Documentation
SSH into the web box, navigate into `icinga2-latest/module/icinga2`
-and pull the current icinga2 revision to update what's new".
+and pull the current support branch.
## Announcement
@@ -126,4 +131,5 @@ and pull the current icinga2 revision to update what's new".
# After the release
* Add new minor version
+* Close the released version
* Update Redmine filters for the next major/minor version
diff --git a/doc/1-about.md b/doc/1-about.md
index e326122..1b7c5e3 100644
--- a/doc/1-about.md
+++ b/doc/1-about.md
@@ -54,6 +54,18 @@ More details in the [Icinga FAQ](https://www.icinga.org/icinga/faq/).
## <a id="whats-new"></a> What's New
+### What's New in Version 2.4.6
+
+#### Feature
+
+* Feature [11638](https://dev.icinga.org/issues/11638 "Feature 11638"): Update RELEASE.md
+
+#### Bugfixes
+
+* Bug [11628](https://dev.icinga.org/issues/11628 "Bug 11628"): Docs: Zone attribute 'endpoints' is an array
+* Bug [11634](https://dev.icinga.org/issues/11634 "Bug 11634"): Icinga 2 fails to build on Ubuntu Xenial
+* Bug [11635](https://dev.icinga.org/issues/11635 "Bug 11635"): Failed assertion in IdoPgsqlConnection::FieldToEscapedString
+
### What's New in Version 2.4.5
#### Changes
diff --git a/doc/6-object-types.md b/doc/6-object-types.md
index d6e8ed6..c303fbe 100644
--- a/doc/6-object-types.md
+++ b/doc/6-object-types.md
@@ -1452,7 +1452,7 @@ Configuration Attributes:
Name |Description
----------------|----------------
- endpoints |**Optional.** Dictionary with endpoints located in this zone.
+ endpoints |**Optional.** Array of endpoint names located in this zone.
parent |**Optional.** The name of the parent zone.
global |**Optional.** Whether configuration files for this zone should be synced to all endpoints. Defaults to false.
diff --git a/icinga2.nuspec b/icinga2.nuspec
index 09d9efe..dc802c9 100755
--- a/icinga2.nuspec
+++ b/icinga2.nuspec
@@ -6,7 +6,7 @@
<!-- Read this before publishing packages to chocolatey.org: https://github.com/chocolatey/chocolatey/wiki/CreatePackages -->
<id>icinga2</id>
<title>Icinga2</title>
- <version>2.4.5</version>
+ <version>2.4.6</version>
<authors>2016 - The Icinga Project</authors>
<owners>Icinga Development Team</owners>
<summary>icinga2 - Monitoring Agent for Windows</summary>
diff --git a/icinga2.spec b/icinga2.spec
index e9eca67..a7e18f9 100644
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -66,7 +66,7 @@
Summary: Network monitoring application
Name: icinga2
-Version: 2.4.5
+Version: 2.4.6
Release: %{revision}%{?dist}
License: GPL-2.0+
Group: Applications/System
diff --git a/lib/db_ido_pgsql/idopgsqlconnection.cpp b/lib/db_ido_pgsql/idopgsqlconnection.cpp
index 9eae07c..c1b7295 100644
--- a/lib/db_ido_pgsql/idopgsqlconnection.cpp
+++ b/lib/db_ido_pgsql/idopgsqlconnection.cpp
@@ -600,7 +600,8 @@ bool IdoPgsqlConnection::FieldToEscapedString(const String& key, const Value& va
if (DbValue::IsObjectInsertID(value)) {
dbrefcol = GetInsertID(dbobjcol);
- ASSERT(dbrefcol.IsValid());
+ if (!dbrefcol.IsValid())
+ return false;
} else {
dbrefcol = GetObjectID(dbobjcol);
diff --git a/third-party/cmake/FindMySQL.cmake b/third-party/cmake/FindMySQL.cmake
index d243379..e29f11a 100644
--- a/third-party/cmake/FindMySQL.cmake
+++ b/third-party/cmake/FindMySQL.cmake
@@ -45,6 +45,8 @@ FIND_PATH(MYSQL_INCLUDE_DIR mysql.h
#----------------- FIND MYSQL_LIB_DIR -------------------
IF (WIN32)
+ SET(MYSQL_CLIENT_LIBS libmysql)
+
# Set lib path suffixes
# dist = for mysql binary distributions
# build = for custom built tree
@@ -67,6 +69,7 @@ IF (WIN32)
$ENV{ProgramFiles}/MySQL/*/lib/${libsuffixDist}
$ENV{SystemDrive}/MySQL/*/lib/${libsuffixDist})
ELSE (WIN32)
+ SET(MYSQL_CLIENT_LIBS mysqlclient_r)
FIND_LIBRARY(MYSQL_LIB NAMES mysqlclient_r
PATHS
$ENV{MYSQL_DIR}/libmysql_r/.libs
@@ -80,6 +83,23 @@ ELSE (WIN32)
/opt/local/lib/mysql5/mysql
/opt/mysql/mysql/lib/mysql
/opt/mysql/lib/mysql)
+
+ IF(NOT MYSQL_LIB)
+ SET(MYSQL_CLIENT_LIBS mysqlclient)
+ FIND_LIBRARY(MYSQL_LIB NAMES mysqlclient
+ PATHS
+ $ENV{MYSQL_DIR}/libmysql_r/.libs
+ $ENV{MYSQL_DIR}/lib
+ $ENV{MYSQL_DIR}/lib/mysql
+ /usr/lib/mysql
+ /usr/local/lib/mysql
+ /usr/local/mysql/lib
+ /usr/local/mysql/lib/mysql
+ /opt/local/mysql5/lib
+ /opt/local/lib/mysql5/mysql
+ /opt/mysql/mysql/lib/mysql
+ /opt/mysql/lib/mysql)
+ ENDIF (NOT MYSQL_LIB)
ENDIF (WIN32)
IF(MYSQL_LIB)
@@ -96,11 +116,6 @@ IF (MYSQL_INCLUDE_DIR AND MYSQL_LIB_DIR)
FIND_LIBRARY(MYSQL_YASSL yassl PATHS ${MYSQL_LIB_DIR})
FIND_LIBRARY(MYSQL_TAOCRYPT taocrypt PATHS ${MYSQL_LIB_DIR})
- IF (WIN32)
- SET(MYSQL_CLIENT_LIBS libmysql)
- ELSE (WIN32)
- SET(MYSQL_CLIENT_LIBS mysqlclient_r)
- ENDIF (WIN32)
IF (MYSQL_ZLIB)
SET(MYSQL_CLIENT_LIBS ${MYSQL_CLIENT_LIBS} zlib)
ENDIF (MYSQL_ZLIB)
diff --git a/tools/chocolateyInstall.ps1 b/tools/chocolateyInstall.ps1
index f0a8b0a..dd4346d 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.5-x86.msi'
-$url64 = 'http://packages.icinga.org/windows/Icinga2-v2.4.5-x86_64.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'
$silentArgs = '/silent'
$validExitCodes = @(0)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-nagios/pkg-icinga2.git
More information about the Pkg-nagios-changes
mailing list