tyler.durden/rpm-icinga2
1
0
Fork 0
mirror of https://git.icinga.com/packaging/rpm-icinga2.git synced 2025-09-24 10:37:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add patch for PR #7152

Browse Source 
To fix a MySQL linking problem on newer MySQL versions - especially RHEL8
This commit is contained in:
Markus Frosch 2019-07-23 13:02:15 +02:00
parent 81b1229db0
commit d0cfb5d09e
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
github-pr-7152.patch Normal file
View File

@ -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;

5
icinga2.spec
View File

@ -93,6 +93,8 @@ Release: %{revision}%{?dist}
Url: https://www.icinga.com/ Url: https://www.icinga.com/
Source: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: %{name}-bin = %{version}-%{release} Requires: %{name}-bin = %{version}-%{release}
Requires: %{name}-common = %{version}-%{release} Requires: %{name}-common = %{version}-%{release}
@ -291,6 +293,9 @@ Provides Nano syntax highlighting for icinga2.
%prep %prep
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch0 -p1
# use absolute shebang instead of env on SUSE distributions # use absolute shebang instead of env on SUSE distributions
%if "%{_vendor}" == "suse" %if "%{_vendor}" == "suse"
find . -type f -name '*.sh' -exec sed -i -e 's|\/usr\/bin\/env bash|\/bin\/bash|g' {} \; find . -type f -name '*.sh' -exec sed -i -e 's|\/usr\/bin\/env bash|\/bin\/bash|g' {} \;