diff options
Diffstat (limited to 'sys-apps/openrc')
| -rw-r--r-- | sys-apps/openrc/Manifest | 3 | ||||
| -rw-r--r-- | sys-apps/openrc/files/openrc-0.45.2-grep-3.8.patch | 35 | ||||
| -rw-r--r-- | sys-apps/openrc/openrc-0.45.2-r2.ebuild (renamed from sys-apps/openrc/openrc-0.45.2-r1.ebuild) | 8 |
3 files changed, 43 insertions, 3 deletions
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest index a705a20ca552..698366d0542e 100644 --- a/sys-apps/openrc/Manifest +++ b/sys-apps/openrc/Manifest @@ -1,6 +1,7 @@ +AUX openrc-0.45.2-grep-3.8.patch 1175 BLAKE2B ba19778859730be7f85558ba5577eec414f336cc61dc3120c34f95274d17c907b060cf4b532fc3a9c2921f0707f66137fd343ede3a2c8f94ba4d1918900c9935 SHA512 af0b83cf69a56f815ae363eede36c3bd477ece2de99892faf4fb4edda045f8716a13d7292c666345005d36f6aba117e73f44a39f8b13966433173673494b6720 AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a20ef625a1959e77dbf38cd1756838337fb39a061c4ee19a39cccd2f5867fab9f04fb916a74029aaa SHA512 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb DIST openrc-0.45.2.tar.gz 246515 BLAKE2B bb7d52b183612eb8924a2d0f9ec63eea88253d8d83964d6341a4715a6cdc372b3fd99ad0f972f4f539da9d741548777dabf4ced86fd20be741a89a69ffe2ff01 SHA512 ca2958772240f6e5037e39db1ee62a81091a2efa654da967f68e03a721868c6c0a41d32a2bddf55c8eadbc9bf5837b710cc2e4564844a7fbc0e585366da4fdf9 -EBUILD openrc-0.45.2-r1.ebuild 4545 BLAKE2B 5a65659d046e2db4e79d66baad7731bfe49e9c96d208f6e3279b68f4e644b62a839438fc47afd5d46485044ddad027571d1bc74a01db88e046a42b1fdd004cd7 SHA512 7b3b7ddae45ca7dddacc1831abee689364b71d35a74a6e466a6c44fdce62dcedc7d4be4b960bbbd3f90e51bd4685bd7e423788a812b9caf26a470d283b5eb9b0 +EBUILD openrc-0.45.2-r2.ebuild 4595 BLAKE2B da0df99c14b6984dc97aee9beaf5cb777bb3d15076d6f6be64459327c4848fecd0957a3e42c2135bbc3dd6e2e9ee17f4004a4750108a4b3e33c4dc22c2e68e2c SHA512 e2a3fd3dc7aab7bcdcc81aaa8f9ac4b889cfaf82229054f0c71e9caeb49a8fa9395fa39eb215b66d73b78b7c18a661a4289ca2844a907a5c92250898b7809e35 EBUILD openrc-9999.ebuild 4553 BLAKE2B f806b0547ff994c52c342715043d2f0c7fff2a6dfe61151e58c0bb46a40afae03ce3d5c0e45220b89c89f70018981d97390a181603a134447169d1ade94aea3b SHA512 5215b2129a086deefc099f802329189faf219feab85897ced9b47d4c31405e64ca85d98ca9a1218ddb671204e5678c60a02c9551c7a8ff57d5c4681a4ec7a973 MISC metadata.xml 707 BLAKE2B 713b69a4e4d6a61051c9f6dfda46da3afa62c590c62b4f371f3949140eaecfa665a977091ac858bff99380dfc3758038ee6a96b0c8b88c142e2e751b20318fba SHA512 5260e1aec8973d42bf059b1f20b3a5f95b98608efeac614d46b20d774a3453c25348cea4a45d745abe829ad016dbc524080c482c1666032e969e08fefe1efc37 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 + diff --git a/sys-apps/openrc/openrc-0.45.2-r1.ebuild b/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) |