diff --git a/github-pr-7152.patch b/github-pr-7152.patch new file mode 100644 index 0000000000000000000000000000000000000000..001bc3723b2400614d3d929f66d033485c2f3a56 --- /dev/null +++ b/github-pr-7152.patch @@ -0,0 +1,37 @@ +From 615f019c2e2da9e66c4c0c484d0f916c876d7bdc Mon Sep 17 00:00:00 2001 +From: Elias Ohm <eohm@novomind.com> +Date: Mon, 29 Apr 2019 00:18:15 +0200 +Subject: [PATCH] account for adjusted interface of mysql8 (now utilizes c99 + bools instead of my_bool labelled chars) + +--- + lib/mysql_shim/mysqlinterface.cpp | 2 +- + lib/mysql_shim/mysqlinterface.hpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/mysql_shim/mysqlinterface.cpp b/lib/mysql_shim/mysqlinterface.cpp +index 5807639e2d..aadefda476 100644 +--- a/lib/mysql_shim/mysqlinterface.cpp ++++ b/lib/mysql_shim/mysqlinterface.cpp +@@ -92,7 +92,7 @@ struct MysqlInterfaceImpl final : public MysqlInterface + return mysql_real_escape_string(mysql, to, from, length); + } + +- my_bool ssl_set(MYSQL *mysql, const char *key, const char *cert, const char *ca, const char *capath, const char *cipher) const override ++ bool ssl_set(MYSQL *mysql, const char *key, const char *cert, const char *ca, const char *capath, const char *cipher) const override + { + return mysql_ssl_set(mysql, key, cert, ca, capath, cipher); + } +diff --git a/lib/mysql_shim/mysqlinterface.hpp b/lib/mysql_shim/mysqlinterface.hpp +index 2aac49d24c..1ac63868c1 100644 +--- a/lib/mysql_shim/mysqlinterface.hpp ++++ b/lib/mysql_shim/mysqlinterface.hpp +@@ -35,7 +35,7 @@ struct MysqlInterface + virtual MYSQL *real_connect(MYSQL *mysql, const char *host, const char *user, const char *passwd, + const char *db, unsigned int port, const char *unix_socket, unsigned long clientflag) const = 0; + virtual unsigned long real_escape_string(MYSQL *mysql, char *to, const char *from, unsigned long length) const = 0; +- virtual my_bool ssl_set(MYSQL *mysql, const char *key, const char *cert, const char *ca, const char *capath, const char *cipher) const = 0; ++ virtual bool ssl_set(MYSQL *mysql, const char *key, const char *cert, const char *ca, const char *capath, const char *cipher) const = 0; + virtual MYSQL_RES *store_result(MYSQL *mysql) const = 0; + virtual unsigned int thread_safe() const = 0; + diff --git a/icinga2.spec b/icinga2.spec index 570eef48f3bf7121d483f8f2655798b3831cc0ed..c63ddc3cda141a3f4ceae75ad920e62a61b5a940 100644 --- a/icinga2.spec +++ b/icinga2.spec @@ -93,6 +93,8 @@ Release: %{revision}%{?dist} Url: https://www.icinga.com/ Source: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz +Patch0: https://github.com/Icinga/icinga2/pull/7152.patch#/github-pr-7152.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %{name}-bin = %{version}-%{release} Requires: %{name}-common = %{version}-%{release} @@ -291,6 +293,9 @@ Provides Nano syntax highlighting for icinga2. %prep %setup -q -n %{name}-%{version} + +%patch0 -p1 + # use absolute shebang instead of env on SUSE distributions %if "%{_vendor}" == "suse" find . -type f -name '*.sh' -exec sed -i -e 's|\/usr\/bin\/env bash|\/bin\/bash|g' {} \;