| 1 |
commit: 46d22908c12a935d53749cdfce34a86f2820eb76 |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Feb 5 11:41:22 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 5 16:36:15 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46d22908 |
| 7 |
|
| 8 |
sys-apps/openrc: remove unused patches |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/3820 |
| 11 |
|
| 12 |
sys-apps/openrc/files/openrc-0.8.3-ccwgroup.patch | 57 ---------------------- |
| 13 |
.../files/openrc-0.8.3-deprecation_warning.patch | 33 ------------- |
| 14 |
2 files changed, 90 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sys-apps/openrc/files/openrc-0.8.3-ccwgroup.patch b/sys-apps/openrc/files/openrc-0.8.3-ccwgroup.patch |
| 17 |
deleted file mode 100644 |
| 18 |
index 14ecd5f..00000000 |
| 19 |
--- a/sys-apps/openrc/files/openrc-0.8.3-ccwgroup.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,57 +0,0 @@ |
| 22 |
-From c427d3c1fec89f6a9281dccdc123bad73af80804 Mon Sep 17 00:00:00 2001 |
| 23 |
-From: Mike Frysinger <vapier@g.o> |
| 24 |
-Date: Tue, 28 Jun 2011 00:02:11 -0400 |
| 25 |
-Subject: [PATCH] net: ccwgroup: smooth up/down process |
| 26 |
- |
| 27 |
-We need to bring the link up ourselves after we've properly configured |
| 28 |
-the device. The common code tries to bring the link up itself, but it |
| 29 |
-does so before things are configured, and so it ends up failing. |
| 30 |
- |
| 31 |
-When shutting down, we need to wait for the kernel to finish destroying |
| 32 |
-the interface. Otherwise, when doing a restart, openrc is quick enough |
| 33 |
-to tell the kernel to destroy things, but then start trying to bring it |
| 34 |
-back up before the kernel has finished. |
| 35 |
- |
| 36 |
-X-Gentoo-Bug: 367467 |
| 37 |
-X-Gentoo-Bug-URL: http://bugs.gentoo.org/367467 |
| 38 |
-Signed-off-by: Mike Frysinger <vapier@g.o> |
| 39 |
---- |
| 40 |
- net/ccwgroup.sh | 14 ++++++++++++-- |
| 41 |
- 1 files changed, 12 insertions(+), 2 deletions(-) |
| 42 |
- |
| 43 |
-diff --git a/net/ccwgroup.sh b/net/ccwgroup.sh |
| 44 |
-index 248b159..60cd25f 100644 |
| 45 |
---- a/net/ccwgroup.sh |
| 46 |
-+++ b/net/ccwgroup.sh |
| 47 |
-@@ -58,6 +58,11 @@ ccwgroup_pre_start() |
| 48 |
- echo "${val}" > /sys/devices/${ccw_type}/${first}/${var} |
| 49 |
- done |
| 50 |
- eend $? |
| 51 |
-+ |
| 52 |
-+ # Now that we've properly configured the device, we can run |
| 53 |
-+ # bring the interface up. Common code tried to do this already, |
| 54 |
-+ # but it failed because we didn't setup sysfs yet. |
| 55 |
-+ _up |
| 56 |
- } |
| 57 |
- |
| 58 |
- ccwgroup_pre_stop() |
| 59 |
-@@ -88,9 +93,14 @@ ccwgroup_post_stop() |
| 60 |
- local device="$(service_get_value ccwgroup_device)" |
| 61 |
- [ -z "${device}" ] && return 0 |
| 62 |
- local ccw_type="$(service_get_value ccwgroup_type)" |
| 63 |
-+ local path="/sys/devices/${ccw_type}/${device}" |
| 64 |
- |
| 65 |
- einfo "Disabling ccwgroup/${ccw_type} on ${IFACE}" |
| 66 |
-- echo "0" >/sys/devices/${ccw_type}/"${device}"/online |
| 67 |
-- echo "1" >/sys/devices/${ccw_type}/"${device}"/ungroup |
| 68 |
-+ if echo "0" >"${path}"/online && |
| 69 |
-+ echo "1" >"${path}"/ungroup ; then |
| 70 |
-+ # The device doesn't disappear right away which breaks |
| 71 |
-+ # restart, or a quick start up, so wait around. |
| 72 |
-+ while [ -e "${path}" ] ; do :; done |
| 73 |
-+ fi |
| 74 |
- eend $? |
| 75 |
- } |
| 76 |
--- |
| 77 |
-1.7.5.3 |
| 78 |
- |
| 79 |
|
| 80 |
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 |
| 81 |
deleted file mode 100644 |
| 82 |
index 1aa7315..00000000 |
| 83 |
--- a/sys-apps/openrc/files/openrc-0.8.3-deprecation_warning.patch |
| 84 |
+++ /dev/null |
| 85 |
@@ -1,33 +0,0 @@ |
| 86 |
-From 24ba7955634dd571a4c34dd712dc8a592eea4d73 Mon Sep 17 00:00:00 2001 |
| 87 |
-From: Joe Harvell <jharvell@××××××.net> |
| 88 |
-Date: Mon, 27 Jun 2011 23:20:47 +0200 |
| 89 |
-Subject: [PATCH] Only print the deprecation warning for --chuid/-c when using it |
| 90 |
- |
| 91 |
-The deprecation warning has been printed when using the replecement functions as |
| 92 |
-well, bug 373243. |
| 93 |
---- |
| 94 |
- src/rc/start-stop-daemon.c | 5 ++--- |
| 95 |
- 1 files changed, 2 insertions(+), 3 deletions(-) |
| 96 |
- |
| 97 |
-diff --git a/src/rc/start-stop-daemon.c b/src/rc/start-stop-daemon.c |
| 98 |
-index b5c2b6e..3017701 100644 |
| 99 |
---- a/src/rc/start-stop-daemon.c |
| 100 |
-+++ b/src/rc/start-stop-daemon.c |
| 101 |
-@@ -788,12 +788,11 @@ start_stop_daemon(int argc, char **argv) |
| 102 |
- background = true; |
| 103 |
- break; |
| 104 |
- |
| 105 |
-- case 'u': /* --user <username>|<uid> */ |
| 106 |
- case 'c': /* --chuid <username>|<uid> */ |
| 107 |
-- { |
| 108 |
- /* DEPRECATED */ |
| 109 |
- ewarn("WARNING: -c/--chuid is deprecated and will be removed in the future, please use -u/--user instead"); |
| 110 |
-- |
| 111 |
-+ case 'u': /* --user <username>|<uid> */ |
| 112 |
-+ { |
| 113 |
- p = optarg; |
| 114 |
- tmp = strsep(&p, ":"); |
| 115 |
- changeuser = xstrdup(tmp); |
| 116 |
--- |
| 117 |
-1.7.3.4 |
| 118 |
- |
Archives