update to icinga 2.12.4

This commit is contained in:
sthen 2021-05-28 10:45:00 +00:00
parent da88da6c4c
commit 6f54f4b455
3 changed files with 4 additions and 36 deletions

View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.112 2021/05/22 05:15:35 rsadowski Exp $
# $OpenBSD: Makefile,v 1.113 2021/05/28 10:45:00 sthen Exp $
COMMENT-main = network monitoring system
COMMENT-mysql = MySQL support for icinga2
COMMENT-pgsql = PostgreSQL support for icinga2
V = 2.12.3
REVISION = 2
V = 2.12.4
GH_PROJECT = icinga2
GH_TAGNAME = v$V

View File

@ -1,2 +1,2 @@
SHA256 (icinga2-2.12.3.tar.gz) = Vjh9XgR98E/ZH9uNsxJOsJMlxzd/vKoR7wYxR9uBbfs=
SIZE (icinga2-2.12.3.tar.gz) = 7534454
SHA256 (icinga2-2.12.4.tar.gz) = QMn/vduD/Sql2UfVdPPkriW7j0m5Ut+j5LK9A2x+r/c=
SIZE (icinga2-2.12.4.tar.gz) = 7535804

View File

@ -1,31 +0,0 @@
$OpenBSD: patch-lib_base_utility_cpp,v 1.3 2021/05/22 05:15:35 rsadowski Exp $
https://github.com/Icinga/icinga2/commit/c30bae2994f1e5f33f6da51eb96d423e9bf0f75c
From c30bae2994f1e5f33f6da51eb96d423e9bf0f75c Mon Sep 17 00:00:00 2001
From: Louis Sautier <sautier.louis@gmail.com>
Date: Thu, 20 Aug 2020 18:25:48 +0200
Subject: [PATCH] =?UTF-8?q?Fix=20=E2=80=98fs::copy=5Foption=E2=80=99=20has?=
=?UTF-8?q?=20not=20been=20declared=20with=20boost=201.74.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
It was deprecated in
https://github.com/boostorg/filesystem/commit/f199152b7df036ff1606c85e4ea1b28edfeda6cc
Index: lib/base/utility.cpp
--- lib/base/utility.cpp.orig
+++ lib/base/utility.cpp
@@ -725,7 +725,11 @@ void Utility::CopyFile(const String& source, const Str
{
namespace fs = boost::filesystem;
+#if BOOST_VERSION >= 107400
+ fs::copy_file(fs::path(source.Begin(), source.End()), fs::path(target.Begin(), target.End()), fs::copy_options::overwrite_existing);
+#else /* BOOST_VERSION */
fs::copy_file(fs::path(source.Begin(), source.End()), fs::path(target.Begin(), target.End()), fs::copy_option::overwrite_if_exists);
+#endif /* BOOST_VERSION */
}
/*