commit: 46d22908c12a935d53749cdfce34a86f2820eb76 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Sun Feb 5 11:41:22 2017 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sun Feb 5 16:36:15 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46d22908
sys-apps/openrc: remove unused patches Closes: https://github.com/gentoo/gentoo/pull/3820 sys-apps/openrc/files/openrc-0.8.3-ccwgroup.patch | 57 ---------------------- .../files/openrc-0.8.3-deprecation_warning.patch | 33 ------------- 2 files changed, 90 deletions(-) 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 14ecd5f..00000000 --- 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 <[email protected]> -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 <[email protected]> ---- - 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 1aa7315..00000000 --- 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 <[email protected]> -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 <username>|<uid> */ - case 'c': /* --chuid <username>|<uid> */ -- { - /* DEPRECATED */ - ewarn("WARNING: -c/--chuid is deprecated and will be removed in the future, please use -u/--user instead"); -- -+ case 'u': /* --user <username>|<uid> */ -+ { - p = optarg; - tmp = strsep(&p, ":"); - changeuser = xstrdup(tmp); --- -1.7.3.4 -
