diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-21 20:47:17 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-21 20:47:17 +0000 |
commit | 4ab6db5717ef23f29320d4c6fb9ebdb8dec1f193 (patch) | |
tree | f7640b8b96a04499f1ce44a2cad122d45a8373bd /sys-apps/openrc | |
parent | 48bdeb0db9c7ffed22c6eb859ee40b55ba598b86 (diff) |
gentoo resync : 21.12.2017
Diffstat (limited to 'sys-apps/openrc')
-rw-r--r-- | sys-apps/openrc/Manifest | 2 | ||||
-rw-r--r-- | sys-apps/openrc/files/openrc-9999-msg-style.patch | 81 | ||||
-rw-r--r-- | sys-apps/openrc/files/openrc-9999-pause.patch | 29 |
3 files changed, 0 insertions, 112 deletions
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest index 48bfd8dacc91..e65d0ff94cbb 100644 --- a/sys-apps/openrc/Manifest +++ b/sys-apps/openrc/Manifest @@ -1,5 +1,3 @@ -AUX openrc-9999-msg-style.patch 2775 BLAKE2B 2334a7937f4876575bad5ad452bcbe3627b5283650f5b54ff35acf87daddb5811cdcd70286246a516b89cb4a1a2e67e02eda83e508021bc59ca31714e46f8683 SHA512 ffeaba677106929ed842d38b161a865a6b3bd26e4ed804bf922d7a1e3c749adbf23348a20ca1be44f41cc0abd7d113172f1865d29865f322e30fbac9f9b34cba -AUX openrc-9999-pause.patch 825 BLAKE2B 569aa4e0d8c4aa043658625eb88f3c3afbaf8033e3dbf1575faf1302b56bf64768b6aac824ed0e980f6f4dbc5817c02a9ca8e4f925de63574c4d9a21b9bb43a7 SHA512 ebab7434c5e1b76b882d99d45069de33da07230c9fa9bf28212b18c2742d726aff7be62907964cad9c37b483c25d805dc07d0c5927349f8104fef2f957e69943 AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a20ef625a1959e77dbf38cd1756838337fb39a061c4ee19a39cccd2f5867fab9f04fb916a74029aaa SHA512 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb DIST openrc-0.28.tar.gz 224228 BLAKE2B 6f4693003aba77148bb5ed3516c1372e3ca67364a25d866fce418ba6a287a8cc0c33534cbe1edcdab32a869f8f8dc72819fb2dffc46375bca1e053fb3acf415b SHA512 a10c293bf4287bcc4ffb9c996cbc1294f979483ea9fb2efb0dd1becee193f49ff114530c078850e8c11cf2c0a812be2e74801352fdbfe313b90cd9af5b8ccf93 diff --git a/sys-apps/openrc/files/openrc-9999-msg-style.patch b/sys-apps/openrc/files/openrc-9999-msg-style.patch deleted file mode 100644 index ac325bb79bcf..000000000000 --- a/sys-apps/openrc/files/openrc-9999-msg-style.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 1e307244138c8f650ab37bffa7b3cc3e3b39cd64 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Mon, 24 Mar 2008 01:48:19 -0400 -Subject: [PATCH] restore old e* func output - -Gentoo has always used the sytle: - * moo ... [ ok ] -Latest openrc now does: -* moo... [ok] - -Realistically, 4 spaces out of 80 on reduced terminals doesn't make any -sort of realistic difference and it's been just fine for the last 10 -years, so keep the default behavior. ---- - src/libeinfo/libeinfo.c | 15 ++++++--------- - 1 files changed, 6 insertions(+), 9 deletions(-) - -diff --git a/src/libeinfo/libeinfo.c b/src/libeinfo/libeinfo.c -index 8a7613c..234b1af 100644 ---- a/src/libeinfo/libeinfo.c -+++ b/src/libeinfo/libeinfo.c -@@ -643,7 +643,7 @@ static int EINFO_PRINTF(3, 0) - fprintf(f, "\n"); - if (_eprefix) - fprintf(f, "%s%s%s|", _ecolor(f, color), _eprefix, _ecolor(f, ECOLOR_NORMAL)); -- fprintf(f, "%s*%s ", _ecolor(f, color), _ecolor(f, ECOLOR_NORMAL)); -+ fprintf(f, " %s*%s ", _ecolor(f, color), _ecolor(f, ECOLOR_NORMAL)); - retval += _eindent(f); - va_copy(ap, va); - retval += vfprintf(f, fmt, ap) + 3; -@@ -800,7 +800,7 @@ ebegin(const char *EINFO_RESTRICT fmt, ...) - va_start(ap, fmt); - retval = _einfovn(fmt, ap); - va_end(ap); -- retval += printf("..."); -+ retval += printf(" ..."); - if (colour_terminal(stdout)) - retval += printf("\n"); - LASTCMD("ebegin"); -@@ -817,7 +817,7 @@ _eend(FILE * EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg) - if (!msg) - return; - -- cols = get_term_columns(fp) - (strlen(msg) + 3); -+ cols = get_term_columns(fp) - (strlen(msg) + 5); - - /* cons25 is special - we need to remove one char, otherwise things - * do not align properly at all. */ -@@ -831,18 +831,15 @@ _eend(FILE * EINFO_RESTRICT fp, int col, ECOLOR color, const char *msg) - if (term_is_cons25) - cols--; - -- /* If extra spacing is required around msg, then please change -- * via a runtime knob and leave this default as is as it saves 2 -- * valuable columns when running on 80 column screens. */ - if (cols > 0 && colour_terminal(fp)) { -- fprintf(fp, "%s%s %s[%s%s%s]%s\n", up, tgoto(goto_column, 0, cols), -+ fprintf(fp, "%s%s %s[%s %s %s]%s\n", up, tgoto(goto_column, 0, cols), - ecolor(ECOLOR_BRACKET), ecolor(color), msg, - ecolor(ECOLOR_BRACKET), ecolor(ECOLOR_NORMAL)); - } else { - if (col > 0) - for (i = 0; i < cols - col; i++) - fprintf(fp, " "); -- fprintf(fp, " [%s]\n", msg); -+ fprintf(fp, " [ %s ]\n", msg); - } - } - -@@ -1030,7 +1027,7 @@ ebeginv(const char *EINFO_RESTRICT fmt, ...) - - va_start(ap, fmt); - retval = _einfovn(fmt, ap); -- retval += printf("..."); -+ retval += printf(" ..."); - if (colour_terminal(stdout)) - retval += printf("\n"); - va_end(ap); --- -1.6.6.rc3 - diff --git a/sys-apps/openrc/files/openrc-9999-pause.patch b/sys-apps/openrc/files/openrc-9999-pause.patch deleted file mode 100644 index bf2c94f8dbec..000000000000 --- a/sys-apps/openrc/files/openrc-9999-pause.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e82772a6b6d4374e81b7e19a593ffdef16753418 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Mon, 21 Dec 2009 09:02:35 -0500 -Subject: [PATCH] restore init.d pause option - ---- - src/rc/runscript.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/src/rc/runscript.c b/src/rc/runscript.c -index 5939dae..7147902 100644 ---- a/src/rc/runscript.c -+++ b/src/rc/runscript.c -@@ -1316,6 +1316,12 @@ runscript(int argc, char **argv) - prefix = NULL; - retval = svc_exec("status", NULL); - } else { -+ if (strcmp(optarg, "pause") == 0) { -+ ewarn("WARNING: 'pause' is deprecated; please use '--nodeps stop'"); -+ deps = false; -+ optarg = "stop"; -+ } -+ - if (strcmp(optarg, "conditionalrestart") == 0 || - strcmp(optarg, "condrestart") == 0) - { --- -1.6.6.rc3 - |