[arch-commits] Commit in kea/trunk (2 files)

[Sven-Hendrik Haase]

    Date: Tuesday, April 24, 2018 @ 00:56:38
  Author: svenstaro
Revision: 317474

upgpkg: kea 1.3.0-7

rebuild for log4cplus 2.0

Added:
  kea/trunk/3c22fedef78c5391561dd66c0a0de6d593351f6c.patch
Modified:
  kea/trunk/PKGBUILD

------------------------------------------------+
 3c22fedef78c5391561dd66c0a0de6d593351f6c.patch |   65 +++++++++++++++++++++++
 PKGBUILD                                       |    7 +-
 2 files changed, 70 insertions(+), 2 deletions(-)

Added: 3c22fedef78c5391561dd66c0a0de6d593351f6c.patch
===================================================================
--- 3c22fedef78c5391561dd66c0a0de6d593351f6c.patch	                        (rev 0)
+++ 3c22fedef78c5391561dd66c0a0de6d593351f6c.patch	2018-04-24 00:56:38 UTC (rev 317474)
@@ -0,0 +1,65 @@
+From d6c31960033ff0f4aa05b4c2698cf456145ce6ff Mon Sep 17 00:00:00 2001
+From: Francis Dupont <fdupont at isc.org>
+Date: Sun, 8 Oct 2017 01:09:11 +0200
+Subject: [PATCH] [5380] Addressed another log4cplus 2.0.0 API change
+
+---
+ src/lib/log/logger_level_impl.cc | 10 ++++++++--
+ src/lib/log/logger_level_impl.h  |  6 +++++-
+ 2 files changed, 13 insertions(+), 3 deletions(-)
+
+diff --git a/src/lib/log/logger_level_impl.cc b/src/lib/log/logger_level_impl.cc
+index 79ca4856f2..fdcc5d367f 100644
+--- a/src/lib/log/logger_level_impl.cc
++++ b/src/lib/log/logger_level_impl.cc
+@@ -177,20 +177,26 @@ LoggerLevelImpl::logLevelFromString(const log4cplus::tstring& level) {
+ 
+ // Convert logging level to string.  If the level is a valid debug level,
+ // return the string DEBUG, else return the empty string.
++#if LOG4CPLUS_VERSION < LOG4CPLUS_MAKE_VERSION(2, 0, 0)
+ LoggerLevelImpl::LogLevelString
++#else
++const LoggerLevelImpl::LogLevelString&
++#endif
+ LoggerLevelImpl::logLevelToString(log4cplus::LogLevel level) {
+     Level bindlevel = convertToBindLevel(level);
+     Severity& severity = bindlevel.severity;
+     int& dbglevel = bindlevel.dbglevel;
++    static LoggerLevelImpl::LogLevelString debug_ = tstring("DEBUG");
++    static LoggerLevelImpl::LogLevelString empty_ = tstring();
+ 
+     if ((severity == DEBUG) &&
+         ((dbglevel >= MIN_DEBUG_LEVEL) && (dbglevel <= MAX_DEBUG_LEVEL))) {
+-        return (tstring("DEBUG"));
++        return (debug_);
+     }
+ 
+     // Unknown, so return empty string for log4cplus to try other conversion
+     // functions.
+-    return (tstring());
++    return (empty_);
+ }
+ 
+ // Initialization.  Register the conversion functions with the LogLevelManager.
+diff --git a/src/lib/log/logger_level_impl.h b/src/lib/log/logger_level_impl.h
+index 96696c2b1f..77da5f7408 100644
+--- a/src/lib/log/logger_level_impl.h
++++ b/src/lib/log/logger_level_impl.h
+@@ -1,4 +1,4 @@
+-// Copyright (C) 2011-2016 Internet Systems Consortium, Inc. ("ISC")
++// Copyright (C) 2011-2017 Internet Systems Consortium, Inc. ("ISC")
+ //
+ // This Source Code Form is subject to the terms of the Mozilla Public
+ // License, v. 2.0. If a copy of the MPL was not distributed with this
+@@ -107,7 +107,11 @@ typedef log4cplus::tstring LogLevelString;
+     /// \param level Extended logging level
+     ///
+     /// \return Equivalent string.
++#if LOG4CPLUS_VERSION < LOG4CPLUS_MAKE_VERSION(2, 0, 0)
+     static LogLevelString logLevelToString(log4cplus::LogLevel level);
++#else
++    static const LogLevelString& logLevelToString(log4cplus::LogLevel level);
++#endif
+ 
+     /// \brief Initialize extended logging levels
+     ///

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-24 00:56:04 UTC (rev 317473)
+++ PKGBUILD	2018-04-24 00:56:38 UTC (rev 317474)
@@ -25,7 +25,8 @@
         asiolink-fix-build-with-boost-1.66.patch
         tmpfiles-kea.conf
         kea-dhcp4.service
-        kea-dhcp6.service)
+        kea-dhcp6.service
+        3c22fedef78c5391561dd66c0a0de6d593351f6c.patch)
 sha512sums=('4708485efe537d9af00b50da9a3f33b740edaf37d9bbfe96f5625e30715349c48ef8a32f5abb8320f00821aea642a5b7ecdbc9f0d323a71b7a07f46f1bed978b'
             'SKIP'
             '81874fd3a12f55ea23593b7248c7653450c3a6e5ba8e79c7c5fb40ab685b0dc5d4e29e50f10000bd9018200731dba35f15e5d86c8005c94d14865d73e19983e5'
@@ -32,7 +33,8 @@
             '2ac01524f70c95986cb64f8d0fc29612aec38c8ab95892469329ced071cf3660b4e9997b6e22a62765c244a9c68b41c4729aec8cfe03099e009ce858faa5c661'
             '13a473bea4f8a1ba40f5667b880010590c5fddecaa76c360113e977c9ab3898558141cda17000def7b1c592b7dc6f8d5a508752351c601f6484abd775b60d214'
             '873612cdab1c5d72105ccf379885975405e10b4e4b3b93b258293fbd304ea9f6a47e5af5357b130e603d713691d4980d8868a5ed23376e50aba6eb81b348b8cb'
-            '48cd98cfc2a82b4d5f6350e70ba7048976a633ceae3c8f405824d2131700d78a9eeb885a41634a393e3cdaacc9836dda45343b7ae81c44427b46e758d6520f6c')
+            '48cd98cfc2a82b4d5f6350e70ba7048976a633ceae3c8f405824d2131700d78a9eeb885a41634a393e3cdaacc9836dda45343b7ae81c44427b46e758d6520f6c'
+            '5c1d0d76e2c1a9e1e96935703b9e92143ecdae56afde66fcdd3a76c473a7af5336107a344ccbd5834b02b86c7797f157b89b9f5d28fb5a7bdc1c155c3c830854')
 validpgpkeys=('BE0E9748B718253A28BB89FFF1B11BF05CF02E57') # Internet Systems Consortium, Inc. (Signing key, 2017-2018) <codesign at isc.org>
 
 prepare() {
@@ -43,6 +45,7 @@
   patch -p1 < "${srcdir}"/fix-scripts-include-path.patch
 
   patch -p1 < "${srcdir}"/asiolink-fix-build-with-boost-1.66.patch
+  patch -p1 < "${srcdir}"/3c22fedef78c5391561dd66c0a0de6d593351f6c.patch
 }
 
 build() {