summaryrefslogtreecommitdiff
path: root/sys-apps/openrc/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-12-03 14:59:59 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-12-03 14:59:59 +0000
commit529abfa74a08ae5099db9780bcdf8250aa52ecb6 (patch)
tree2e2d1a9fd6e89b4872499afea3dc57490271e69c /sys-apps/openrc/files
parente6ba529df30e3fc9dfdf55ec5797f2f764df6e54 (diff)
gentoo auto-resync : 03:12:2022 - 14:59:58
Diffstat (limited to 'sys-apps/openrc/files')
-rw-r--r--sys-apps/openrc/files/openrc-0.45.2-grep-3.8.patch35
1 files changed, 35 insertions, 0 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 <particleflux@gmail.com>
+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
+