From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 619C3158021 for ; Sat, 3 Dec 2022 12:17:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9A68AE0F95; Sat, 3 Dec 2022 12:17:29 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8595BE0F95 for ; Sat, 3 Dec 2022 12:17:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B22D9341486 for ; Sat, 3 Dec 2022 12:17:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4DEDE76F for ; Sat, 3 Dec 2022 12:17:27 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1670069806.09e6575b72d2b8bb8948feb0bbdcfd47eddb903b.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/openrc/files/, sys-apps/openrc/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/openrc/files/openrc-0.45.2-grep-3.8.patch sys-apps/openrc/openrc-0.45.2-r1.ebuild sys-apps/openrc/openrc-0.45.2-r2.ebuild X-VCS-Directories: sys-apps/openrc/ sys-apps/openrc/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 09e6575b72d2b8bb8948feb0bbdcfd47eddb903b X-VCS-Branch: master Date: Sat, 3 Dec 2022 12:17:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4e426b3f-8524-447b-95a6-0a69a5318165 X-Archives-Hash: 6c163e249b8972741f43219ad3c74ce5 commit: 09e6575b72d2b8bb8948feb0bbdcfd47eddb903b Author: Sam James gentoo org> AuthorDate: Sat Dec 3 12:16:46 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Dec 3 12:16:46 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09e6575b sys-apps/openrc: backport grep 3.8 warning fix Closes: https://bugs.gentoo.org/875557 Signed-off-by: Sam James gentoo.org> sys-apps/openrc/files/openrc-0.45.2-grep-3.8.patch | 35 ++++++++++++++++++++++ ...rc-0.45.2-r1.ebuild => openrc-0.45.2-r2.ebuild} | 8 +++-- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/sys-apps/openrc/files/openrc-0.45.2-grep-3.8.patch b/sys-apps/openrc/files/openrc-0.45.2-grep-3.8.patch new file mode 100644 index 000000000000..c6eddeec9048 --- /dev/null +++ b/sys-apps/openrc/files/openrc-0.45.2-grep-3.8.patch @@ -0,0 +1,35 @@ +https://bugs.gentoo.org/875557 +https://github.com/OpenRC/openrc/issues/548 +https://github.com/OpenRC/openrc/commit/9380347f042f7d294317f4420b648422817eb75a + +From 9380347f042f7d294317f4420b648422817eb75a Mon Sep 17 00:00:00 2001 +From: Stefan Linke +Date: Wed, 7 Sep 2022 17:18:09 +0200 +Subject: [PATCH] Avoid warning on grep 3.8 in hwclock + +Starting with grep version 3.8, the hwclock init script logs warnings +about stray backslashes: + +> hwclock | * Setting system clock using the hardware clock [UTC] ... +> hwclock |grep: warning: stray \ before - +> hwclock |grep: warning: stray \ before - + +This is caused by the check for existence of the `--noadjfile` argument +in function `get_noadjfile()`. + +Replacing the affected logic with an explicit argument denoting the +pattern as such resolves the issue. + +Fixes #548 +--- a/init.d/hwclock.in ++++ b/init.d/hwclock.in +@@ -72,7 +72,7 @@ get_noadjfile() + { + if ! yesno $clock_adjfile; then + # Some implementations don't handle adjustments +- if LC_ALL=C hwclock --help 2>&1 | grep -q "\-\-noadjfile"; then ++ if LC_ALL=C hwclock --help 2>&1 | grep -q -e "--noadjfile"; then + echo --noadjfile + fi + fi + diff --git a/sys-apps/openrc/openrc-0.45.2-r1.ebuild b/sys-apps/openrc/openrc-0.45.2-r2.ebuild similarity index 97% rename from sys-apps/openrc/openrc-0.45.2-r1.ebuild rename to sys-apps/openrc/openrc-0.45.2-r2.ebuild index 806d414f6ac0..1d0fad63f7ab 100644 --- a/sys-apps/openrc/openrc-0.45.2-r1.ebuild +++ b/sys-apps/openrc/openrc-0.45.2-r2.ebuild @@ -55,10 +55,14 @@ RDEPEND="${COMMON_DEPEND} PDEPEND="netifrc? ( net-misc/netifrc )" +PATCHES=( + "${FILESDIR}"/${P}-grep-3.8.patch +) + src_configure() { local emesonargs=( - $(meson_feature audit) - "-Dbranding=\"Gentoo Linux\"" + $(meson_feature audit) + "-Dbranding=\"Gentoo Linux\"" $(meson_use newnet) -Dos=Linux $(meson_use pam)