From 6fa626fb44b999b331cfc1dbbfd1b40f1cc8f16c Mon Sep 17 00:00:00 2001 From: "Michael Mair-Keimberger (asterix)" Date: Sat, 4 Feb 2017 18:39:57 +0100 Subject: [PATCH] sys-apps/openrc: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/3809 --- .../openrc/files/openrc-0.8.3-ccwgroup.patch | 57 ------------- .../openrc-0.8.3-deprecation_warning.patch | 33 -------- .../openrc/files/openrc-9999-msg-style.patch | 81 ------------------- sys-apps/openrc/files/openrc-9999-pause.patch | 29 ------- 4 files changed, 200 deletions(-) delete mode 100644 sys-apps/openrc/files/openrc-0.8.3-ccwgroup.patch delete mode 100644 sys-apps/openrc/files/openrc-0.8.3-deprecation_warning.patch delete mode 100644 sys-apps/openrc/files/openrc-9999-msg-style.patch delete mode 100644 sys-apps/openrc/files/openrc-9999-pause.patch diff --git a/sys-apps/openrc/files/openrc-0.8.3-ccwgroup.patch b/sys-apps/openrc/files/openrc-0.8.3-ccwgroup.patch deleted file mode 100644 index 14ecd5f837d2..000000000000 --- a/sys-apps/openrc/files/openrc-0.8.3-ccwgroup.patch +++ /dev/null @@ -1,57 +0,0 @@ -From c427d3c1fec89f6a9281dccdc123bad73af80804 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Tue, 28 Jun 2011 00:02:11 -0400 -Subject: [PATCH] net: ccwgroup: smooth up/down process - -We need to bring the link up ourselves after we've properly configured -the device. The common code tries to bring the link up itself, but it -does so before things are configured, and so it ends up failing. - -When shutting down, we need to wait for the kernel to finish destroying -the interface. Otherwise, when doing a restart, openrc is quick enough -to tell the kernel to destroy things, but then start trying to bring it -back up before the kernel has finished. - -X-Gentoo-Bug: 367467 -X-Gentoo-Bug-URL: http://bugs.gentoo.org/367467 -Signed-off-by: Mike Frysinger ---- - net/ccwgroup.sh | 14 ++++++++++++-- - 1 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/net/ccwgroup.sh b/net/ccwgroup.sh -index 248b159..60cd25f 100644 ---- a/net/ccwgroup.sh -+++ b/net/ccwgroup.sh -@@ -58,6 +58,11 @@ ccwgroup_pre_start() - echo "${val}" > /sys/devices/${ccw_type}/${first}/${var} - done - eend $? -+ -+ # Now that we've properly configured the device, we can run -+ # bring the interface up. Common code tried to do this already, -+ # but it failed because we didn't setup sysfs yet. -+ _up - } - - ccwgroup_pre_stop() -@@ -88,9 +93,14 @@ ccwgroup_post_stop() - local device="$(service_get_value ccwgroup_device)" - [ -z "${device}" ] && return 0 - local ccw_type="$(service_get_value ccwgroup_type)" -+ local path="/sys/devices/${ccw_type}/${device}" - - einfo "Disabling ccwgroup/${ccw_type} on ${IFACE}" -- echo "0" >/sys/devices/${ccw_type}/"${device}"/online -- echo "1" >/sys/devices/${ccw_type}/"${device}"/ungroup -+ if echo "0" >"${path}"/online && -+ echo "1" >"${path}"/ungroup ; then -+ # The device doesn't disappear right away which breaks -+ # restart, or a quick start up, so wait around. -+ while [ -e "${path}" ] ; do :; done -+ fi - eend $? - } --- -1.7.5.3 - diff --git a/sys-apps/openrc/files/openrc-0.8.3-deprecation_warning.patch b/sys-apps/openrc/files/openrc-0.8.3-deprecation_warning.patch deleted file mode 100644 index 1aa7315b0b12..000000000000 --- a/sys-apps/openrc/files/openrc-0.8.3-deprecation_warning.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 24ba7955634dd571a4c34dd712dc8a592eea4d73 Mon Sep 17 00:00:00 2001 -From: Joe Harvell -Date: Mon, 27 Jun 2011 23:20:47 +0200 -Subject: [PATCH] Only print the deprecation warning for --chuid/-c when using it - -The deprecation warning has been printed when using the replecement functions as -well, bug 373243. ---- - src/rc/start-stop-daemon.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -diff --git a/src/rc/start-stop-daemon.c b/src/rc/start-stop-daemon.c -index b5c2b6e..3017701 100644 ---- a/src/rc/start-stop-daemon.c -+++ b/src/rc/start-stop-daemon.c -@@ -788,12 +788,11 @@ start_stop_daemon(int argc, char **argv) - background = true; - break; - -- case 'u': /* --user | */ - case 'c': /* --chuid | */ -- { - /* DEPRECATED */ - ewarn("WARNING: -c/--chuid is deprecated and will be removed in the future, please use -u/--user instead"); -- -+ case 'u': /* --user | */ -+ { - p = optarg; - tmp = strsep(&p, ":"); - changeuser = xstrdup(tmp); --- -1.7.3.4 - 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 -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 -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 - -- 2.26.2