From patchwork Sat Jun 1 17:33:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 44536 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 676BBC27C55 for ; Sat, 1 Jun 2024 17:33:39 +0000 (UTC) Received: from a27-33.smtp-out.us-west-2.amazonses.com (a27-33.smtp-out.us-west-2.amazonses.com [54.240.27.33]) by mx.groups.io with SMTP id smtpd.web10.42228.1717263217935323263 for ; Sat, 01 Jun 2024 10:33:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx header.b=CrPAbIVm; dkim=pass header.i=@amazonses.com header.s=7v7vs6w47njt4pimodk5mmttbegzsi6n header.b=DyWIne1b; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.33, mailfrom: 0101018fd4dd309e-bf688b98-62be-415d-8830-4361164dfea1-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=rnkzp2s7ci3kogmesvov2nwn7wcc2dgx; d=yoctoproject.org; t=1717263217; h=Content-Type:MIME-Version:From:To:Subject:Message-Id:Date; bh=87lA2xr1DfP034oBJja5c657liE6jlbb5QXBjVsYeoo=; b=CrPAbIVmN3m6UIgF1mReWVzSkFzCSqfsfk4R+aiKezuS3sHXLhkSXQ6EKp8hU79u zQJV9W9NL2U2fLoi5wQ+vBe6ZVhSHpwpcvprVaRi1fBFdzLKNXb6hPk+MjUdSFVtQr8 7SiF4+W5r0z1R9F5HO+bvklSY9g/eBPkgJvFlm6s= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=7v7vs6w47njt4pimodk5mmttbegzsi6n; d=amazonses.com; t=1717263217; h=Content-Type:MIME-Version:From:To:Subject:Message-Id:Date:Feedback-ID; bh=87lA2xr1DfP034oBJja5c657liE6jlbb5QXBjVsYeoo=; b=DyWIne1b6JncO/W0Okhui4RuTpm6lrx1MGAatcMyG2bP+g+Eir/w34xNucfNa8d9 qTXogUTVKhN3vx32x4ZUGXxv8hqLbXkTqkGEMfJxr29G2G3kWHUjCwbZk4jR2jDrA0S WQ9KG7ULv8bnmmqo1dYJTrFPbiwUEeY9BjnSLlUo= MIME-Version: 1.0 From: auh@yoctoproject.org To: openembedded-core@lists.openembedded.org Subject: [AUH] kea: upgrading to 2.6.0 SUCCEEDED Message-ID: <0101018fd4dd309e-bf688b98-62be-415d-8830-4361164dfea1-000000@us-west-2.amazonses.com> Date: Sat, 1 Jun 2024 17:33:36 +0000 Feedback-ID: ::1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.06.01-54.240.27.33 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sat, 01 Jun 2024 17:33:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/200122 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *kea* to *2.6.0* has Succeeded. Next steps: - apply the patch: git am 0001-kea-upgrade-2.4.1-2.6.0.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 385460f884a4b852afeaa2d81d1037782c2be176 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Sat, 1 Jun 2024 07:57:40 +0000 Subject: [PATCH] kea: upgrade 2.4.1 -> 2.6.0 --- ...er_unittest_support.cc-do-not-write-.patch | 3 +-- .../kea/files/fix-multilib-conflict.patch | 7 +++--- .../kea/files/fix_pid_keactrl.patch | 7 +++--- .../kea/{kea_2.4.1.bb => kea_2.6.0.bb} | 23 +++++++++++++++++-- 4 files changed, 28 insertions(+), 12 deletions(-) rename meta/recipes-connectivity/kea/{kea_2.4.1.bb => kea_2.6.0.bb} (77%) diff --git a/meta/recipes-connectivity/kea/files/0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch b/meta/recipes-connectivity/kea/files/0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch index 94fbd12737..120b4fabcb 100644 --- a/meta/recipes-connectivity/kea/files/0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch +++ b/meta/recipes-connectivity/kea/files/0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch @@ -1,4 +1,4 @@ -From 841924e1fe8db2bff3eab8d37634ef08f86c00ec Mon Sep 17 00:00:00 2001 +From 36864bf97a685b07887150442b94d7dd59970e30 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 10 Nov 2020 15:57:03 +0000 Subject: [PATCH] src/lib/log/logger_unittest_support.cc: do not write build @@ -8,7 +8,6 @@ This breaks reproducibility and is needed only in unit testing. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin - --- src/lib/log/logger_unittest_support.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch b/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch index 5b135b3aee..af4ab03b23 100644 --- a/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch +++ b/meta/recipes-connectivity/kea/files/fix-multilib-conflict.patch @@ -1,4 +1,4 @@ -From 06ebd1b2ced426c420ed162980eca194f9f918ae Mon Sep 17 00:00:00 2001 +From b7a49483ba3117a565a46fa715cefdc8294aa0ee Mon Sep 17 00:00:00 2001 From: Kai Kang Date: Tue, 22 Sep 2020 15:02:33 +0800 Subject: [PATCH] There are conflict of config files between kea and lib32-kea: @@ -14,14 +14,13 @@ Because they are all commented out, replace the expanded libdir path with Upstream-Status: Submitted [https://gitlab.isc.org/isc-projects/kea/-/issues/2602] Signed-off-by: Kai Kang - --- src/bin/keactrl/kea-ctrl-agent.conf.pre | 3 ++- src/bin/keactrl/kea-dhcp4.conf.pre | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/bin/keactrl/kea-ctrl-agent.conf.pre b/src/bin/keactrl/kea-ctrl-agent.conf.pre -index e6ae8b8..50a3092 100644 +index d8e0429..b2ec5b5 100644 --- a/src/bin/keactrl/kea-ctrl-agent.conf.pre +++ b/src/bin/keactrl/kea-ctrl-agent.conf.pre @@ -51,7 +51,8 @@ @@ -35,7 +34,7 @@ index e6ae8b8..50a3092 100644 // "param1": "foo" // } diff --git a/src/bin/keactrl/kea-dhcp4.conf.pre b/src/bin/keactrl/kea-dhcp4.conf.pre -index 6edb8a1..b2a7385 100644 +index 55af9db..056f06f 100644 --- a/src/bin/keactrl/kea-dhcp4.conf.pre +++ b/src/bin/keactrl/kea-dhcp4.conf.pre @@ -255,7 +255,7 @@ diff --git a/meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch b/meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch index 63a6a2805b..568646c896 100644 --- a/meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch +++ b/meta/recipes-connectivity/kea/files/fix_pid_keactrl.patch @@ -1,4 +1,4 @@ -From c878a356712606549f7f188b62f7d1cae08a176e Mon Sep 17 00:00:00 2001 +From 017f339d246b519757c69dbb577957831bbe40a2 Mon Sep 17 00:00:00 2001 From: Armin kuster Date: Wed, 14 Oct 2020 22:48:31 -0700 Subject: [PATCH] Busybox does not support ps -p so use pgrep @@ -7,16 +7,15 @@ Upstream-Status: Inappropriate [embedded specific] Based on changes from Diego Sueiro Signed-off-by: Armin kuster - --- src/bin/keactrl/keactrl.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/bin/keactrl/keactrl.in b/src/bin/keactrl/keactrl.in -index 450e997..c353ca9 100644 +index cccfdac..20ae2e6 100644 --- a/src/bin/keactrl/keactrl.in +++ b/src/bin/keactrl/keactrl.in -@@ -149,8 +149,8 @@ check_running() { +@@ -146,8 +146,8 @@ check_running() { # Get the PID from the PID file (if it exists) get_pid_from_file "${proc_name}" if [ ${_pid} -gt 0 ]; then diff --git a/meta/recipes-connectivity/kea/kea_2.4.1.bb b/meta/recipes-connectivity/kea/kea_2.6.0.bb similarity index 77% rename from meta/recipes-connectivity/kea/kea_2.4.1.bb rename to meta/recipes-connectivity/kea/kea_2.6.0.bb index 19309ce314..da15b572ba 100644 --- a/meta/recipes-connectivity/kea/kea_2.4.1.bb +++ b/meta/recipes-connectivity/kea/kea_2.6.0.bb @@ -1,9 +1,28 @@ +# FIXME: the LIC_FILES_CHKSUM values have been updated by 'devtool upgrade'. +# The following is the difference between the old and the new license text. +# Please update the LICENSE value if needed, and summarize the changes in +# the commit message via 'License-Update:' tag. +# (example: 'License-Update: copyright years updated.') +# +# The changes: +# +# --- COPYING +# +++ COPYING +# @@ -1,4 +1,4 @@ +# -Copyright (C) 2009-2023 Internet Systems Consortium, Inc. ("ISC") +# +Copyright (C) 2009-2024 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 +# +# + SUMMARY = "ISC Kea DHCP Server" DESCRIPTION = "Kea is the next generation of DHCP software developed by ISC. It supports both DHCPv4 and DHCPv6 protocols along with their extensions, e.g. prefix delegation and dynamic updates to DNS." HOMEPAGE = "http://kea.isc.org" SECTION = "connectivity" LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=ea061fa0188838072c4248c1318ec131" +LIC_FILES_CHKSUM = "file://COPYING;md5=618093ea9de92c70a115268c1d53421f" DEPENDS = "boost log4cplus openssl" @@ -18,7 +37,7 @@ SRC_URI = "http://ftp.isc.org/isc/kea/${PV}/${BP}.tar.gz \ file://fix_pid_keactrl.patch \ file://0001-src-lib-log-logger_unittest_support.cc-do-not-write-.patch \ " -SRC_URI[sha256sum] = "815c61f5c271caa4a1db31dd656eb50a7f6ea973da3690f7c8581408e180131a" +SRC_URI[sha256sum] = "207ceae33eb3b81ec4e6ac5605249a85b93779333b62aadf39e489f11dbcdc8d" inherit autotools systemd update-rc.d upstream-version-is-even