diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2019-03-07 16:14:54 +0100 |
|---|---|---|
| committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2019-03-10 11:56:15 +0100 |
| commit | 728f770651b3b658cba6e8a38cf5f159137017f0 (patch) | |
| tree | 117eecde85bd7ffcf9eaf0054497e6e03c6e5332 | |
| parent | ff3a29cb7c934b7555678889a8e19633d93afc8b (diff) | |
| download | aports-728f770651b3b658cba6e8a38cf5f159137017f0.tar.bz2 aports-728f770651b3b658cba6e8a38cf5f159137017f0.tar.xz | |
main/openrc: upgrade to 0.41.2
| -rw-r--r-- | main/openrc/APKBUILD | 8 | ||||
| -rw-r--r-- | main/openrc/do-not-complain-if-interrupted-by-a-signal.patch | 45 |
2 files changed, 3 insertions, 50 deletions
diff --git a/main/openrc/APKBUILD b/main/openrc/APKBUILD index c9898e9b8e..fc4f9c0a15 100644 --- a/main/openrc/APKBUILD +++ b/main/openrc/APKBUILD @@ -1,8 +1,8 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=openrc -pkgver=0.39.2 +pkgver=0.41.2 _ver=${pkgver/_git*/} -pkgrel=5 +pkgrel=0 pkgdesc="OpenRC manages the services, startup and shutdown of a host" url="https://gitweb.gentoo.org/proj/openrc.git" arch="all" @@ -20,7 +20,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/OpenRC/openrc/archive/$pkgve 0007-make-consolefont-service-compatible-with-busyboxs-se.patch 0001-fsck-don-t-add-C0-to-busybox-fsck.patch 0008-fix-undeclared-UT_LINESIZE.patch - do-not-complain-if-interrupted-by-a-signal.patch openrc.logrotate hostname.initd @@ -82,7 +81,7 @@ package() { ln -s /sbin/rc-service "$pkgdir"/sbin/service } -sha512sums="ea1f23bb479085eea406bebe304a531d061e47955f7c98da21aa4f01694b5c6f23cb1bb9764aa7b27fd4c8c5a7602eb2a16baef63eb96660fab58c063ff88129 openrc-0.39.2.tar.gz +sha512sums="ebfa691cae4704bb3023ea0508a712a45b8c20809828729dfa5292e96f3fd1b309813d80d7c286d0c09680bf5378aba40cfd994f27951f43a3ffb1fd0d69a58b openrc-0.41.2.tar.gz 71fce711adbcb411189a089f1d49567c50348e12c42b7a9c9b582dae5d18051f88ccf81c768337e87d6792d953e84d1e8b93d7978a1947d7d20ef3b1cd330875 0001-call-sbin-mkmntdirs-in-localmount-OpenRC-service.patch b1cedd38badda4fc308decdff06f9644b96fe35617792da8d6d62407409841705fd71b5b57d1804a6395095604a70898f80830c76395ec99f715038a0809d815 0002-force-root-be-rw-before-localmount.patch 9dea3fcdb90e3e8078a771beefeba3ca91b9966a1b8ee9ff96cf460e7dd21abbc4a46a501a960c3edf5a76c083c2cf60ccb06d9da7a4c6df2a50660745beb278 0003-sysctl-add-compatibility-for-busybox-sysctl.patch @@ -91,7 +90,6 @@ d54630d40a2d6b10a325cb012d4efcda997a60c008ca953ce5d60059d3f267308a59dabddf93a5fc 234c4f3cf39df3350dbea25c00b8d584794b28194f44c726767a6a16d91a26fee1b5d2dd16635f19803fc015b4e9d99c52b23128e6b815938b88365feba8cf59 0007-make-consolefont-service-compatible-with-busyboxs-se.patch dbe3f170440f0f357f31ac4d49c56a9a7ec22172df2701bf4a0afdee22aedda1f88b9fa5ffdbe19a5eea3c764ad0e4c802e19b95b7082a72d423d46d30c18edd 0001-fsck-don-t-add-C0-to-busybox-fsck.patch e56ea82dbf8bf6b4cff4fa48db8e4f06589094ba99aad930fc498e2fe235db6ce2afe96e2bc047dd9066a4057d4e3691f8d0148ad5fed5d8191c0e2415a48f69 0008-fix-undeclared-UT_LINESIZE.patch -25a32c87a7e95e3c891156855b3c501cd529bb39810b362204cf187c2a4230b51cc9b6d96d0750ca4ef454fd7ef0bb01533e059ef35ab27939aafc4da551a6f5 do-not-complain-if-interrupted-by-a-signal.patch 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec openrc.logrotate 259552165ee5e9ca973bbe18d1d9ec5cc67526cb26a9e0ac717076ef4913bb7ff4055d6ccb9f77996ed9c00b67f46edba552e1a21b836068a112dda2428502b3 hostname.initd c06eac7264f6cc6888563feeae5ca745aae538323077903de1b19102e4f16baa34c18b8c27af5dd5423e7670834e2261e9aa55f2b1ec8d8fdc2be105fe894d55 hwdrivers.initd diff --git a/main/openrc/do-not-complain-if-interrupted-by-a-signal.patch b/main/openrc/do-not-complain-if-interrupted-by-a-signal.patch deleted file mode 100644 index 1d1a329c37..0000000000 --- a/main/openrc/do-not-complain-if-interrupted-by-a-signal.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 2504a2c25bc0587b36d81a2d85c203b20e2d40cf Mon Sep 17 00:00:00 2001 -From: William Hubbs <w.d.hubbs@gmail.com> -Date: Wed, 14 Nov 2018 17:44:03 -0600 -Subject: [PATCH] Do not complain if interrupted by a signal - -In start-stop-daemon and rc-schedules, we were printing out a warning if -the nanosleep call was interrupted by a signal, but we did not treat -this as an error situation other than displaying the message, so there -is no need for the message. ---- - src/rc/rc-schedules.c | 5 +---- - src/rc/start-stop-daemon.c | 4 +--- - 2 files changed, 2 insertions(+), 7 deletions(-) - -diff --git a/src/rc/rc-schedules.c b/src/rc/rc-schedules.c -index f7ef20fb..84c7ea18 100644 ---- a/src/rc/rc-schedules.c -+++ b/src/rc/rc-schedules.c -@@ -376,10 +376,7 @@ int run_stop_schedule(const char *applet, - printf("\n"); - progressed = false; - } -- if (errno == EINTR) -- eerror("%s: caught an" -- " interrupt", applet); -- else { -+ if (errno != EINTR) { - eerror("%s: nanosleep: %s", - applet, strerror(errno)); - return 0; -diff --git a/src/rc/start-stop-daemon.c b/src/rc/start-stop-daemon.c -index 33f886c4..a96b29f0 100644 ---- a/src/rc/start-stop-daemon.c -+++ b/src/rc/start-stop-daemon.c -@@ -996,9 +996,7 @@ int main(int argc, char **argv) - ts.tv_sec = start_wait / 1000; - ts.tv_nsec = (start_wait % 1000) * ONE_MS; - if (nanosleep(&ts, NULL) == -1) { -- if (errno == EINTR) -- eerror("%s: caught an interrupt", applet); -- else { -+ if (errno != EINTR) { - eerror("%s: nanosleep: %s", - applet, strerror(errno)); - return 0; |