1 |
commit: db01d95a16c585987dc9f6e8e09faa580baba14e |
2 |
Author: Felix Janda <felix.janda <AT> posteo <DOT> de> |
3 |
AuthorDate: Sun Jul 10 19:39:36 2016 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Jul 15 05:38:05 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=db01d95a |
7 |
|
8 |
sys-apps/sysvinit: In tree version works |
9 |
|
10 |
Gentoo-Bug: https://bugs.gentoo.org/580958 |
11 |
|
12 |
sys-apps/sysvinit/Manifest | 12 -- |
13 |
sys-apps/sysvinit/files/inittab-2.87 | 58 --------- |
14 |
sys-apps/sysvinit/files/reboot.sh | 11 -- |
15 |
sys-apps/sysvinit/files/shutdown.sh | 13 -- |
16 |
sys-apps/sysvinit/files/sysvinit-2.86-kexec.patch | 142 --------------------- |
17 |
.../files/sysvinit-2.86-shutdown-single.patch | 36 ------ |
18 |
.../sysvinit/files/sysvinit-2.88-makefile.patch | 60 --------- |
19 |
sys-apps/sysvinit/files/sysvinit-2.88-musl.patch | 10 -- |
20 |
.../sysvinit/files/sysvinit-2.88-selinux.patch | 38 ------ |
21 |
.../sysvinit/files/sysvinit-2.88-shutdown-h.patch | 65 ---------- |
22 |
sys-apps/sysvinit/metadata.xml | 8 -- |
23 |
sys-apps/sysvinit/sysvinit-2.88-r999.ebuild | 113 ---------------- |
24 |
12 files changed, 566 deletions(-) |
25 |
|
26 |
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest |
27 |
deleted file mode 100644 |
28 |
index 8593b15..0000000 |
29 |
--- a/sys-apps/sysvinit/Manifest |
30 |
+++ /dev/null |
31 |
@@ -1,12 +0,0 @@ |
32 |
-AUX inittab-2.87 1789 SHA256 bc1ff4d63a0e4a878f6864f16b2f286c2d4c92c876f0b950f2b9c4bce7746b19 SHA512 cd7f7ea6d3c38753b809dc74c4a436ec90291cf720bcdfbc990b1c43a79ac644149491fbe515d2eda7a53a0c1ee2af272d3ea7630d5d4eab5837ac55627fb9bd WHIRLPOOL a00cc7b77008aaabb7108de0f6258ac81c2c18c4d5a93a1ba07743c4ceb7eccbd91d610ded9351ba36111bdad7d9c22f89bf8bef6e4fafcdbe60d4789c613114 |
33 |
-AUX reboot.sh 304 SHA256 967fa572014ac6dd69f5e7e24d5250abad9c20c644563b927b295778608cafef SHA512 d47cde84e3a3b98b2f24d09d58977e22ec3db23c5860624ce29a40815df1a7aa69d9da92fd13769e19b52291e48d24a930fe536ba16365ada0ad96a6e157b73c WHIRLPOOL 5fc4d2479eda414bbad53ffa9a22d1333b366d84657c816c9019d5050f84de551e8793712c2d4153189c22216afd1ba7dff7aed91544f7a2428fd65114968e42 |
34 |
-AUX shutdown.sh 385 SHA256 2cc84a5194a949f16a82c6215459f4bf6d8156e50d8d9130d310f085bb208d4c SHA512 cffa58c2b548e6aadeb05944cf7b88f93b4b40351766eaf24e0e3f258c03bb24c748311fcbb30c16efa3ed7b9cc0ccaa2be02099e1f37930f599d064da9e2054 WHIRLPOOL 42b63e21e12975c21c5aec479696b836e482b622b81ec7028139f7fea2f6a77d4bf98414ecd139ad5b1c5d698963a15ce5aedd06f7deb60193249f3dbc33c3d9 |
35 |
-AUX sysvinit-2.86-kexec.patch 3910 SHA256 a9d764afc05ae73c2153b024a3b9e3295ba913e14e9684ddf1fd94467e4bc823 SHA512 6ce3adf698554d15394edbe6dbfc62822859854d503b201c9f96bd81c2a8cd249ed44229a85dd8b97f454f9311abc5792e349f5cc512ff6d5570500d88044bee WHIRLPOOL aecabc2b97e80d401bba856a38ab92d66c038eb00fe58e56e7e87d6ecb4ef0ec8e07534430887eb3f204dfac20f2d94e6ea81e2d7597e3a937442f376f703887 |
36 |
-AUX sysvinit-2.86-shutdown-single.patch 1229 SHA256 78852ca410e7ee23bf69cb6e566cb90404d8c8b7bcc10b264f66c97e0359d431 SHA512 b1fa6225cdb0d5ed6d2d3128a9ad29dc76f14845c3fe57aa2edf234af456ae49f700b25ed4170a6337f662be224bd6ddfd424331483b0c482fd33cd045ddc575 WHIRLPOOL a770eec46053c67a047832742197b8d30d8b5e2e27cad0dc4f608cbccde0b5ece7e08102c51372cc0b33304e266e3b03156d12209db14fbe61800b312ad556aa |
37 |
-AUX sysvinit-2.88-makefile.patch 1545 SHA256 34d6ee50be139ad08b620569df11ac6a4cdf3dae737733dda21a716c4064c194 SHA512 d19e260902f69dd19bfaa4f3e415a816388663a7f89b9d102b27f44c5f2d0654b64ab2e5689a20a3975ff0801e4fb96ef7b6737bfb4ba9466ec58c477de322aa WHIRLPOOL bba46046a59969ac2007c3c932bf07646a5ebece72a216990c185b8eeead724e88cd349219ae528060b9c71a5df97d1e3221691cdbb77e16c9522014c836a76d |
38 |
-AUX sysvinit-2.88-musl.patch 240 SHA256 392bea0f822852e740280a04b5446d41954cb8627d9edf076d2532a79ab15478 SHA512 cac79c4bc874b987db53d5011fded8a0a038c794bfe884ac9caf901d6098aa9a611150e80f23712c404768e2a0c8fb6ff4c392a269165a0104cb1f18e79b0987 WHIRLPOOL 473f855e5054228612d36e752bd052fa47ae962d757d3a5c4d3f73dbb90becdb106f7a0c4e6c39470a210e53e051b3ba9dd5b3430e640d312a556ded30137654 |
39 |
-AUX sysvinit-2.88-selinux.patch 1041 SHA256 e987ab6e478e5b3987ae1c6e338cfc66ae356f704d0c3ea932f9e4335b4986f0 SHA512 46eeb3ab2dd25f314b9f60b2dc8a7da2aa2aafb978953a730ccc36456d240e317930e86df69ce2592cf45978f3307dfc2522b24ae1158e64ff17dfa6ed84dcb8 WHIRLPOOL 4fe319df09759addf9499367a6da47e8effe93ec0a4ba5b7e7b1d0c746b324a303cdc81eb360c81e529faf41260d69e2b4364d6695b390db9dba1e3d1693c872 |
40 |
-AUX sysvinit-2.88-shutdown-h.patch 1626 SHA256 642585158e6fbb185ed53804be2eeea85c037726ed19beb51a9ffb594e63ca0f SHA512 244ed7c2242f52674153ccfebb92c7a9bdc68a25f98aacbbf107ddfce11b195483e90150619fbeae3167136fcb54b878f8eb77e2dfe225d9f2eeb2c182e5e2fe WHIRLPOOL 6500d8be6313190e5ccf8ca0fe3d51ef879458f59e7ebe1849f666f3c20ffdea21d73f2951e978ac0bf7dce1f47be0113e129db784fdabb6f4407e4d78a3cb0d |
41 |
-DIST sysvinit-2.88dsf.tar.bz2 105551 SHA256 60bbc8c1e1792056e23761d22960b30bb13eccc2cabff8c7310a01f4d5df1519 SHA512 0bd8eeb124e84fdfa8e621b05f796804ee69a9076b65f5115826bfa814ac1d5d28d31a5c22ebe77c86a93b2288edf4891adc0afaecc4de656c4ecda8a83807bf WHIRLPOOL f4809e19ea2c72c733d3c09a4964d7a6e67b091d1f1d9ef276515b2f138148bfbf516034d3fb1009289f9520f2fbe9e29687f432bba06fb437ebd6e2b9ef570c |
42 |
-EBUILD sysvinit-2.88-r999.ebuild 3321 SHA256 3c7a1b2e8ce3e743f107fcabc22313ec68222a034e1a0bb594a3aebbe406008b SHA512 74d6ce21c8a9821cf148946c8cf3ab579dea091b6a1c4b73807e6198d021958e240f287f45b454ae4ea9182627607e322054c1f8d2989e55fe4c9146bf4d3a1c WHIRLPOOL 59a41852e599a74d5c84fadd5dc05235c8aa09c1ca0c92572137c8b21a2fffde2f7284bb0cc0db1f8eb688eb85ef348d339cf373cd6c61946b46d04e268459ed |
43 |
-MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8 |
44 |
|
45 |
diff --git a/sys-apps/sysvinit/files/inittab-2.87 b/sys-apps/sysvinit/files/inittab-2.87 |
46 |
deleted file mode 100644 |
47 |
index 1fcb8bb..0000000 |
48 |
--- a/sys-apps/sysvinit/files/inittab-2.87 |
49 |
+++ /dev/null |
50 |
@@ -1,58 +0,0 @@ |
51 |
-# |
52 |
-# /etc/inittab: This file describes how the INIT process should set up |
53 |
-# the system in a certain run-level. |
54 |
-# |
55 |
-# Author: Miquel van Smoorenburg, <miquels@×××××××.nl> |
56 |
-# Modified by: Patrick J. Volkerding, <volkerdi@×××××××××.com> |
57 |
-# Modified by: Daniel Robbins, <drobbins@g.o> |
58 |
-# Modified by: Martin Schlemmer, <azarah@g.o> |
59 |
-# Modified by: Mike Frysinger, <vapier@g.o> |
60 |
-# Modified by: Robin H. Johnson, <robbat2@g.o> |
61 |
-# |
62 |
-# $Id$ |
63 |
- |
64 |
-# Default runlevel. |
65 |
-id:3:initdefault: |
66 |
- |
67 |
-# System initialization, mount local filesystems, etc. |
68 |
-si::sysinit:/sbin/rc sysinit |
69 |
- |
70 |
-# Further system initialization, brings up the boot runlevel. |
71 |
-rc::bootwait:/sbin/rc boot |
72 |
- |
73 |
-l0:0:wait:/sbin/rc shutdown |
74 |
-l0s:0:wait:/sbin/halt -dhp |
75 |
-l1:1:wait:/sbin/rc single |
76 |
-l2:2:wait:/sbin/rc nonetwork |
77 |
-l3:3:wait:/sbin/rc default |
78 |
-l4:4:wait:/sbin/rc default |
79 |
-l5:5:wait:/sbin/rc default |
80 |
-l6:6:wait:/sbin/rc reboot |
81 |
-l6r:6:wait:/sbin/reboot -dk |
82 |
-#z6:6:respawn:/sbin/sulogin |
83 |
- |
84 |
-# new-style single-user |
85 |
-su0:S:wait:/sbin/rc single |
86 |
-su1:S:wait:/sbin/sulogin |
87 |
- |
88 |
-# TERMINALS |
89 |
-c1:12345:respawn:/sbin/agetty 38400 tty1 linux |
90 |
-c2:2345:respawn:/sbin/agetty 38400 tty2 linux |
91 |
-c3:2345:respawn:/sbin/agetty 38400 tty3 linux |
92 |
-c4:2345:respawn:/sbin/agetty 38400 tty4 linux |
93 |
-c5:2345:respawn:/sbin/agetty 38400 tty5 linux |
94 |
-c6:2345:respawn:/sbin/agetty 38400 tty6 linux |
95 |
- |
96 |
-# SERIAL CONSOLES |
97 |
-#s0:12345:respawn:/sbin/agetty -L 9600 ttyS0 vt100 |
98 |
-#s1:12345:respawn:/sbin/agetty -L 9600 ttyS1 vt100 |
99 |
- |
100 |
-# What to do at the "Three Finger Salute". |
101 |
-ca:12345:ctrlaltdel:/sbin/shutdown -r now |
102 |
- |
103 |
-# Used by /etc/init.d/xdm to control DM startup. |
104 |
-# Read the comments in /etc/init.d/xdm for more |
105 |
-# info. Do NOT remove, as this will start nothing |
106 |
-# extra at boot if /etc/init.d/xdm is not added |
107 |
-# to the "default" runlevel. |
108 |
-x:a:once:/etc/X11/startDM.sh |
109 |
|
110 |
diff --git a/sys-apps/sysvinit/files/reboot.sh b/sys-apps/sysvinit/files/reboot.sh |
111 |
deleted file mode 100755 |
112 |
index 3e50f71..0000000 |
113 |
--- a/sys-apps/sysvinit/files/reboot.sh |
114 |
+++ /dev/null |
115 |
@@ -1,11 +0,0 @@ |
116 |
-# Copyright 1999-2007 Gentoo Foundation |
117 |
-# Distributed under the terms of the GNU General Public License v2 |
118 |
- |
119 |
-opts="-dpk" |
120 |
-[ "${RC_DOWN_INTERFACE}" = "yes" ] && opts="${opts}i" |
121 |
- |
122 |
-/sbin/reboot "${opts}" 2>/dev/null |
123 |
- |
124 |
-# hmm, if the above failed, that's kind of odd ... |
125 |
-# so let's force a reboot |
126 |
-/sbin/reboot -f |
127 |
|
128 |
diff --git a/sys-apps/sysvinit/files/shutdown.sh b/sys-apps/sysvinit/files/shutdown.sh |
129 |
deleted file mode 100755 |
130 |
index 502ef52..0000000 |
131 |
--- a/sys-apps/sysvinit/files/shutdown.sh |
132 |
+++ /dev/null |
133 |
@@ -1,13 +0,0 @@ |
134 |
-# Copyright 1999-2006 Gentoo Foundation |
135 |
-# Distributed under the terms of the GNU General Public License v2 |
136 |
- |
137 |
-opts="-d" |
138 |
-[ "${INIT_HALT}" != "HALT" ] && opts="${opts}p" |
139 |
-[ "${RC_DOWN_INTERFACE}" = "yes" ] && opts="${opts}i" |
140 |
-[ "${RC_DOWN_HARDDISK}" = "yes" ] && opts="${opts}h" |
141 |
- |
142 |
-/sbin/halt "${opts}" |
143 |
- |
144 |
-# hmm, if the above failed, that's kind of odd ... |
145 |
-# so let's force a halt |
146 |
-/sbin/halt -f |
147 |
|
148 |
diff --git a/sys-apps/sysvinit/files/sysvinit-2.86-kexec.patch b/sys-apps/sysvinit/files/sysvinit-2.86-kexec.patch |
149 |
deleted file mode 100644 |
150 |
index 4948806..0000000 |
151 |
--- a/sys-apps/sysvinit/files/sysvinit-2.86-kexec.patch |
152 |
+++ /dev/null |
153 |
@@ -1,142 +0,0 @@ |
154 |
-halt: add a -k kexec flag |
155 |
- |
156 |
---- a/man/halt.8 |
157 |
-+++ b/man/halt.8 |
158 |
-@@ -40,6 +40,7 @@ halt, reboot, poweroff \- stop the system. |
159 |
- .RB [ \-d ] |
160 |
- .RB [ \-f ] |
161 |
- .RB [ \-i ] |
162 |
-+.RB [ \-k ] |
163 |
- .br |
164 |
- .B /sbin/poweroff |
165 |
- .RB [ \-n ] |
166 |
-@@ -83,6 +84,8 @@ Put all hard drives on the system in stand-by mode just before halt or power-off |
167 |
- .IP \fB\-p\fP |
168 |
- When halting the system, switch off the power. This is the default when halt is |
169 |
- called as \fBpoweroff\fP. |
170 |
-+.IP \fB\-k\fP |
171 |
-+Try to reboot using \fBkexec\fP, if kernel supports it. |
172 |
- .\"}}} |
173 |
- .\"{{{ Diagnostics |
174 |
- .SH DIAGNOSTICS |
175 |
---- a/src/halt.c |
176 |
-+++ b/src/halt.c |
177 |
-@@ -8,7 +8,7 @@ |
178 |
- * execute an "shutdown -r". This is for compatibility with |
179 |
- * sysvinit 2.4. |
180 |
- * |
181 |
-- * Usage: halt [-n] [-w] [-d] [-f] [-h] [-i] [-p] |
182 |
-+ * Usage: halt [-n] [-w] [-d] [-f] [-h] [-i] [-p] [-k] |
183 |
- * -n: don't sync before halting the system |
184 |
- * -w: only write a wtmp reboot record and exit. |
185 |
- * -d: don't write a wtmp record. |
186 |
-@@ -16,6 +16,7 @@ |
187 |
- * -h: put harddisks in standby mode |
188 |
- * -i: shut down all network interfaces. |
189 |
- * -p: power down the system (if possible, otherwise halt). |
190 |
-+ * -k: reboot the system using kexec. |
191 |
- * |
192 |
- * Reboot and halt are both this program. Reboot |
193 |
- * is just a link to halt. Invoking the program |
194 |
-@@ -74,8 +75,10 @@ extern void write_wtmp(char *user, char *id, int pid, int type, char *line); |
195 |
- */ |
196 |
- void usage(void) |
197 |
- { |
198 |
-- fprintf(stderr, "usage: %s [-n] [-w] [-d] [-f] [-h] [-i]%s\n", |
199 |
-- progname, strcmp(progname, "halt") ? "" : " [-p]"); |
200 |
-+ fprintf(stderr, "usage: %s [-n] [-w] [-d] [-f] [-h] [-i]%s%s\n", |
201 |
-+ progname, |
202 |
-+ strcmp(progname, "halt") ? "" : " [-p]", |
203 |
-+ strcmp(progname, "reboot") ? "" : " [-k]"); |
204 |
- fprintf(stderr, "\t-n: don't sync before halting the system\n"); |
205 |
- fprintf(stderr, "\t-w: only write a wtmp reboot record and exit.\n"); |
206 |
- fprintf(stderr, "\t-d: don't write a wtmp record.\n"); |
207 |
-@@ -84,6 +87,8 @@ void usage(void) |
208 |
- fprintf(stderr, "\t-i: shut down all network interfaces.\n"); |
209 |
- if (!strcmp(progname, "halt")) |
210 |
- fprintf(stderr, "\t-p: power down the system (if possible, otherwise halt).\n"); |
211 |
-+ if (!strcmp(progname, "reboot")) |
212 |
-+ fprintf(stderr, "\t-k: reboot the system using kexec.\n"); |
213 |
- exit(1); |
214 |
- } |
215 |
- |
216 |
-@@ -182,6 +187,7 @@ int main(int argc, char **argv) |
217 |
- int do_ifdown = 0; |
218 |
- int do_hddown = 0; |
219 |
- int do_poweroff = 0; |
220 |
-+ int do_kexec = 0; |
221 |
- int c; |
222 |
- char *tm = NULL; |
223 |
- |
224 |
-@@ -201,7 +207,7 @@ int main(int argc, char **argv) |
225 |
- /* |
226 |
- * Get flags |
227 |
- */ |
228 |
-- while((c = getopt(argc, argv, ":ihdfnpwt:")) != EOF) { |
229 |
-+ while((c = getopt(argc, argv, ":ihdfnpwkt:")) != EOF) { |
230 |
- switch(c) { |
231 |
- case 'n': |
232 |
- do_sync = 0; |
233 |
-@@ -225,6 +231,9 @@ int main(int argc, char **argv) |
234 |
- case 'p': |
235 |
- do_poweroff = 1; |
236 |
- break; |
237 |
-+ case 'k': |
238 |
-+ do_kexec = 1; |
239 |
-+ break; |
240 |
- case 't': |
241 |
- tm = optarg; |
242 |
- break; |
243 |
-@@ -242,10 +251,24 @@ int main(int argc, char **argv) |
244 |
- (void)chdir("/"); |
245 |
- |
246 |
- if (!do_hard && !do_nothing) { |
247 |
-+ c = get_runlevel(); |
248 |
-+ |
249 |
-+ /* |
250 |
-+ * We can't reboot using kexec through this path. |
251 |
-+ */ |
252 |
-+ if (c != '6' && do_reboot && do_kexec) { |
253 |
-+ fprintf(stderr, "ERROR: using -k at this" |
254 |
-+ " runlevel requires also -f\n" |
255 |
-+ " (You probably want instead to reboot" |
256 |
-+ " normally and let your reboot\n" |
257 |
-+ " script, usually /etc/init.d/reboot," |
258 |
-+ " specify -k)\n"); |
259 |
-+ exit(1); |
260 |
-+ } |
261 |
-+ |
262 |
- /* |
263 |
- * See if we are in runlevel 0 or 6. |
264 |
- */ |
265 |
-- c = get_runlevel(); |
266 |
- if (c != '0' && c != '6') |
267 |
- do_shutdown(do_reboot ? "-r" : "-h", tm); |
268 |
- } |
269 |
-@@ -277,6 +300,15 @@ int main(int argc, char **argv) |
270 |
- if (do_nothing) exit(0); |
271 |
- |
272 |
- if (do_reboot) { |
273 |
-+ /* |
274 |
-+ * kexec or reboot |
275 |
-+ */ |
276 |
-+ if (do_kexec) |
277 |
-+ init_reboot(BMAGIC_KEXEC); |
278 |
-+ |
279 |
-+ /* |
280 |
-+ * Fall through if failed |
281 |
-+ */ |
282 |
- init_reboot(BMAGIC_REBOOT); |
283 |
- } else { |
284 |
- /* |
285 |
---- a/src/reboot.h |
286 |
-+++ b/src/reboot.h |
287 |
-@@ -47,5 +47,8 @@ |
288 |
- # define BMAGIC_POWEROFF BMAGIC_HALT |
289 |
- #endif |
290 |
- |
291 |
-+/* for kexec support */ |
292 |
-+#define BMAGIC_KEXEC 0x45584543 |
293 |
-+ |
294 |
- #define init_reboot(magic) reboot(magic) |
295 |
- |
296 |
|
297 |
diff --git a/sys-apps/sysvinit/files/sysvinit-2.86-shutdown-single.patch b/sys-apps/sysvinit/files/sysvinit-2.86-shutdown-single.patch |
298 |
deleted file mode 100644 |
299 |
index b8e403f..0000000 |
300 |
--- a/sys-apps/sysvinit/files/sysvinit-2.86-shutdown-single.patch |
301 |
+++ /dev/null |
302 |
@@ -1,36 +0,0 @@ |
303 |
-This patch makes shutdown use the Single User runlevel by default so |
304 |
-the gettys are shutdown too. |
305 |
- |
306 |
-Roy Marples <uberlord@g.o> |
307 |
- |
308 |
---- a/man/shutdown.8 |
309 |
-+++ b/man/shutdown.8 |
310 |
-@@ -44,7 +44,7 @@ mail and news processing programs a chance to exit cleanly, etc. |
311 |
- \fBshutdown\fP does its job by signalling the \fBinit\fP process, |
312 |
- asking it to change the runlevel. |
313 |
- Runlevel \fB0\fP is used to halt the system, runlevel \fB6\fP is used |
314 |
--to reboot the system, and runlevel \fB1\fP is used to put to system into |
315 |
-+to reboot the system, and runlevel \fBS\fP is used to put to system into |
316 |
- a state where administrative tasks can be performed; this is the default |
317 |
- if neither the \fI-h\fP or \fI-r\fP flag is given to \fBshutdown\fP. |
318 |
- To see which actions are taken on halt or reboot see the appropriate |
319 |
---- a/src/shutdown.c |
320 |
-+++ b/src/shutdown.c |
321 |
-@@ -506,7 +506,7 @@ int main(int argc, char **argv) |
322 |
- usage(); |
323 |
- exit(1); |
324 |
- } |
325 |
-- strcpy(down_level, "1"); |
326 |
-+ strcpy(down_level, "S"); |
327 |
- halttype = NULL; |
328 |
- |
329 |
- /* Process the options. */ |
330 |
-@@ -685,6 +685,8 @@ int main(int argc, char **argv) |
331 |
- strcpy(newstate, "for reboot"); |
332 |
- break; |
333 |
- case '1': |
334 |
-+ case 'S': |
335 |
-+ case 's': |
336 |
- strcpy(newstate, "to maintenance mode"); |
337 |
- break; |
338 |
- default: |
339 |
|
340 |
diff --git a/sys-apps/sysvinit/files/sysvinit-2.88-makefile.patch b/sys-apps/sysvinit/files/sysvinit-2.88-makefile.patch |
341 |
deleted file mode 100644 |
342 |
index 22f463c..0000000 |
343 |
--- a/sys-apps/sysvinit/files/sysvinit-2.88-makefile.patch |
344 |
+++ /dev/null |
345 |
@@ -1,60 +0,0 @@ |
346 |
-http://savannah.nongnu.org/bugs/index.php?29758 |
347 |
- |
348 |
-From 2b7d90f04cdd0e343f413c5c7672615926c02706 Mon Sep 17 00:00:00 2001 |
349 |
-From: wfink <wfink@456724a4-4300-0410-8514-c89748c515a2> |
350 |
-Date: Tue, 4 May 2010 07:50:12 +0000 |
351 |
-Subject: [PATCH] Fix sysvinit bug #29758 |
352 |
- |
353 |
-git-svn-id: svn://svn.sv.gnu.org/sysvinit/sysvinit/trunk@87 456724a4-4300-0410-8514-c89748c515a2 |
354 |
- |
355 |
-diff --git a/src/Makefile b/src/Makefile |
356 |
-index e2b8028..19675c5 100644 |
357 |
---- a/src/Makefile |
358 |
-+++ b/src/Makefile |
359 |
-@@ -92,9 +92,9 @@ all: $(BIN) $(SBIN) $(USRBIN) |
360 |
- init: LDLIBS += $(INITLIBS) $(STATIC) |
361 |
- init: init.o init_utmp.o |
362 |
- |
363 |
--halt: halt.o ifdown.o hddown.o utmp.o reboot.h |
364 |
-+halt: halt.o ifdown.o hddown.o utmp.o |
365 |
- |
366 |
--last: last.o oldutmp.h |
367 |
-+last: last.o |
368 |
- |
369 |
- mesg: mesg.o |
370 |
- |
371 |
-@@ -109,7 +109,7 @@ sulogin: sulogin.o |
372 |
- |
373 |
- wall: dowall.o wall.o |
374 |
- |
375 |
--shutdown: dowall.o shutdown.o utmp.o reboot.h |
376 |
-+shutdown: dowall.o shutdown.o utmp.o |
377 |
- |
378 |
- bootlogd: LDLIBS += -lutil |
379 |
- bootlogd: bootlogd.o |
380 |
-@@ -118,14 +118,22 @@ sulogin.o: CPPFLAGS += $(SELINUX_DEF) |
381 |
- sulogin.o: sulogin.c |
382 |
- |
383 |
- init.o: CPPFLAGS += $(SELINUX_DEF) |
384 |
--init.o: init.c init.h set.h reboot.h initreq.h |
385 |
-+init.o: init.c init.h initreq.h paths.h reboot.h set.h |
386 |
- |
387 |
--utmp.o: utmp.c init.h |
388 |
-+utmp.o: |
389 |
- |
390 |
- init_utmp.o: CPPFLAGS += -DINIT_MAIN |
391 |
--init_utmp.o: utmp.c init.h |
392 |
-+init_utmp.o: utmp.c init.h initreq.h paths.h |
393 |
- $(CC) $(CFLAGS) $(CPPFLAGS) -c -o $@ $< |
394 |
- |
395 |
-+utmpdump.o: utmpdump.c oldutmp.h |
396 |
-+ |
397 |
-+shutdown.o: shutdown.c paths.h reboot.h initreq.h init.h |
398 |
-+ |
399 |
-+halt.o: halt.c reboot.h |
400 |
-+ |
401 |
-+last.o: last.c oldutmp.h |
402 |
-+ |
403 |
- cleanobjs: |
404 |
- rm -f *.o *.bak |
405 |
- |
406 |
|
407 |
diff --git a/sys-apps/sysvinit/files/sysvinit-2.88-musl.patch b/sys-apps/sysvinit/files/sysvinit-2.88-musl.patch |
408 |
deleted file mode 100644 |
409 |
index 6011278..0000000 |
410 |
--- a/sys-apps/sysvinit/files/sysvinit-2.88-musl.patch |
411 |
+++ /dev/null |
412 |
@@ -1,10 +0,0 @@ |
413 |
---- sysvinit-2.88dsf.org/src/init.c |
414 |
-+++ sysvinit-2.88dsf/src/init.c |
415 |
-@@ -51,6 +51,7 @@ |
416 |
- #include <stdarg.h> |
417 |
- #include <sys/syslog.h> |
418 |
- #include <sys/time.h> |
419 |
-+#include <sys/ttydefaults.h> |
420 |
- |
421 |
- #ifdef WITH_SELINUX |
422 |
- # include <selinux/selinux.h> |
423 |
|
424 |
diff --git a/sys-apps/sysvinit/files/sysvinit-2.88-selinux.patch b/sys-apps/sysvinit/files/sysvinit-2.88-selinux.patch |
425 |
deleted file mode 100644 |
426 |
index 91b7435..0000000 |
427 |
--- a/sys-apps/sysvinit/files/sysvinit-2.88-selinux.patch |
428 |
+++ /dev/null |
429 |
@@ -1,38 +0,0 @@ |
430 |
-http://svn.savannah.nongnu.org/viewvc?view=rev&root=sysvinit&revision=90 |
431 |
-https://bugs.gentoo.org/326697 |
432 |
- |
433 |
---- sysvinit/trunk/src/init.c 2010/05/07 15:16:26 89 |
434 |
-+++ sysvinit/trunk/src/init.c 2010/05/17 09:44:34 90 |
435 |
-@@ -54,10 +54,6 @@ |
436 |
- |
437 |
- #ifdef WITH_SELINUX |
438 |
- # include <selinux/selinux.h> |
439 |
--# include <sys/mount.h> |
440 |
--# ifndef MNT_DETACH /* present in glibc 2.10, missing in 2.7 */ |
441 |
--# define MNT_DETACH 2 |
442 |
--# endif |
443 |
- #endif |
444 |
- |
445 |
- #ifdef __i386__ |
446 |
-@@ -2872,11 +2868,9 @@ |
447 |
- |
448 |
- #ifdef WITH_SELINUX |
449 |
- if (getenv("SELINUX_INIT") == NULL) { |
450 |
-- const int rc = mount("proc", "/proc", "proc", 0, 0); |
451 |
-- if (is_selinux_enabled() > 0) { |
452 |
-- putenv("SELINUX_INIT=YES"); |
453 |
-- if (rc == 0) umount2("/proc", MNT_DETACH); |
454 |
-+ if (is_selinux_enabled() != 1) { |
455 |
- if (selinux_init_load_policy(&enforce) == 0) { |
456 |
-+ putenv("SELINUX_INIT=YES"); |
457 |
- execv(myname, argv); |
458 |
- } else { |
459 |
- if (enforce > 0) { |
460 |
-@@ -2887,7 +2881,6 @@ |
461 |
- } |
462 |
- } |
463 |
- } |
464 |
-- if (rc == 0) umount2("/proc", MNT_DETACH); |
465 |
- } |
466 |
- #endif |
467 |
- /* Start booting. */ |
468 |
|
469 |
diff --git a/sys-apps/sysvinit/files/sysvinit-2.88-shutdown-h.patch b/sys-apps/sysvinit/files/sysvinit-2.88-shutdown-h.patch |
470 |
deleted file mode 100644 |
471 |
index 716999c..0000000 |
472 |
--- a/sys-apps/sysvinit/files/sysvinit-2.88-shutdown-h.patch |
473 |
+++ /dev/null |
474 |
@@ -1,65 +0,0 @@ |
475 |
-other inits have moved to not requiring the -h flag when used with -H/-P. |
476 |
-modify sysvinit to be the same since it really doesn't matter. |
477 |
- |
478 |
-https://bugs.gentoo.org/449354 |
479 |
- |
480 |
-patch by Doug Goldstein |
481 |
- |
482 |
---- sysvinit-2.88dsf/man/shutdown.8 |
483 |
-+++ sysvinit-2.88dsf/man/shutdown.8 |
484 |
-@@ -66,16 +66,15 @@ |
485 |
- .\"}}} |
486 |
- .\"{{{ -h |
487 |
- .IP \fB\-h\fP |
488 |
--Halt or power off after shutdown. |
489 |
-+Equivalent to -P, unless -H is specified. |
490 |
- .\"}}} |
491 |
- .\"{{{ -P |
492 |
- .IP \fB\-P\fP |
493 |
--Halt action is to turn off the power. |
494 |
-+Action is to power-off the machine. |
495 |
- .\"}}} |
496 |
- .\"{{{ -H |
497 |
- .IP \fB\-H\fP |
498 |
--Modifier to the -h flag. Halt action is to halt or drop into boot |
499 |
--monitor on systems that support it. Must be used with the -h flag. |
500 |
-+Action is to halt the machine. |
501 |
- .\"}}} |
502 |
- .\"{{{ -f |
503 |
- .IP \fB\-f\fP |
504 |
---- sysvinit-2.88dsf/src/shutdown.c |
505 |
-+++ sysvinit-2.88dsf/src/shutdown.c |
506 |
-@@ -514,9 +514,11 @@ |
507 |
- switch(c) { |
508 |
- case 'H': |
509 |
- halttype = "HALT"; |
510 |
-+ down_level[0] = '0'; |
511 |
- break; |
512 |
- case 'P': |
513 |
- halttype = "POWERDOWN"; |
514 |
-+ down_level[0] = '0'; |
515 |
- break; |
516 |
- case 'a': /* Access control. */ |
517 |
- useacl = 1; |
518 |
-@@ -532,6 +534,8 @@ |
519 |
- break; |
520 |
- case 'h': /* Halt after shutdown */ |
521 |
- down_level[0] = '0'; |
522 |
-+ if (!halttype) |
523 |
-+ halttype = "POWERDOWN"; |
524 |
- break; |
525 |
- case 'f': /* Don't perform fsck after next boot */ |
526 |
- fastboot = 1; |
527 |
-@@ -565,12 +569,6 @@ |
528 |
- } |
529 |
- } |
530 |
- |
531 |
-- if (NULL != halttype && down_level[0] != '0') { |
532 |
-- fprintf(stderr, "shutdown: -H and -P flags can only be used along with -h flag.\n"); |
533 |
-- usage(); |
534 |
-- exit(1); |
535 |
-- } |
536 |
-- |
537 |
- /* Do we need to use the shutdown.allow file ? */ |
538 |
- if (useacl && (fp = fopen(SDALLOW, "r")) != NULL) { |
539 |
- |
540 |
|
541 |
diff --git a/sys-apps/sysvinit/metadata.xml b/sys-apps/sysvinit/metadata.xml |
542 |
deleted file mode 100644 |
543 |
index 56c1244..0000000 |
544 |
--- a/sys-apps/sysvinit/metadata.xml |
545 |
+++ /dev/null |
546 |
@@ -1,8 +0,0 @@ |
547 |
-<?xml version="1.0" encoding="UTF-8"?> |
548 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
549 |
-<pkgmetadata> |
550 |
-<maintainer type="project"> |
551 |
- <email>base-system@g.o</email> |
552 |
- <name>Gentoo Base System</name> |
553 |
-</maintainer> |
554 |
-</pkgmetadata> |
555 |
|
556 |
diff --git a/sys-apps/sysvinit/sysvinit-2.88-r999.ebuild b/sys-apps/sysvinit/sysvinit-2.88-r999.ebuild |
557 |
deleted file mode 100644 |
558 |
index 753b0bd..0000000 |
559 |
--- a/sys-apps/sysvinit/sysvinit-2.88-r999.ebuild |
560 |
+++ /dev/null |
561 |
@@ -1,113 +0,0 @@ |
562 |
-# Copyright 1999-2016 Gentoo Foundation |
563 |
-# Distributed under the terms of the GNU General Public License v2 |
564 |
-# $Id$ |
565 |
- |
566 |
-EAPI="4" |
567 |
- |
568 |
-inherit eutils toolchain-funcs flag-o-matic |
569 |
- |
570 |
-DESCRIPTION="/sbin/init - parent of all processes" |
571 |
-HOMEPAGE="http://savannah.nongnu.org/projects/sysvinit" |
572 |
-SRC_URI="mirror://nongnu/${PN}/${P}dsf.tar.bz2" |
573 |
- |
574 |
-LICENSE="GPL-2" |
575 |
-SLOT="0" |
576 |
-KEYWORDS="amd64 arm ~mips ppc x86" |
577 |
-IUSE="selinux ibm static kernel_FreeBSD" |
578 |
- |
579 |
-RDEPEND="selinux? ( >=sys-libs/libselinux-1.28 )" |
580 |
-DEPEND="${RDEPEND} |
581 |
- virtual/os-headers" |
582 |
- |
583 |
-S=${WORKDIR}/${P}dsf |
584 |
- |
585 |
-src_prepare() { |
586 |
- epatch "${FILESDIR}"/${PN}-2.86-kexec.patch #80220 |
587 |
- epatch "${FILESDIR}"/${PN}-2.86-shutdown-single.patch #158615 |
588 |
- epatch "${FILESDIR}"/${P}-makefile.patch #319197 |
589 |
- epatch "${FILESDIR}"/${P}-selinux.patch #326697 |
590 |
- epatch "${FILESDIR}"/${P}-shutdown-h.patch #449354 |
591 |
- epatch "${FILESDIR}"/${P}-musl.patch |
592 |
- sed -i '/^CPPFLAGS =$/d' src/Makefile || die |
593 |
- |
594 |
- # last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux |
595 |
- sed -i -r \ |
596 |
- -e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \ |
597 |
- -e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \ |
598 |
- src/Makefile || die |
599 |
- |
600 |
- # pidof has moved to >=procps-3.3.9 |
601 |
- sed -i -r \ |
602 |
- -e '/\/bin\/pidof/d' \ |
603 |
- -e '/^MAN8/s:\<pidof.8\>::g' \ |
604 |
- src/Makefile || die |
605 |
- |
606 |
- # Mung inittab for specific architectures |
607 |
- cd "${WORKDIR}" |
608 |
- cp "${FILESDIR}"/inittab-2.87 inittab || die "cp inittab" |
609 |
- local insert=() |
610 |
- use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' ) |
611 |
- use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' ) |
612 |
- use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' ) |
613 |
- use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' ) |
614 |
- use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' ) |
615 |
- if use ibm ; then |
616 |
- insert+=( |
617 |
- '#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0' |
618 |
- '#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0' |
619 |
- ) |
620 |
- fi |
621 |
- (use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab |
622 |
- if use kernel_FreeBSD ; then |
623 |
- sed -i \ |
624 |
- -e 's/linux/cons25/g' \ |
625 |
- -e 's/ttyS0/cuaa0/g' \ |
626 |
- -e 's/ttyS1/cuaa1/g' \ |
627 |
- inittab #121786 |
628 |
- fi |
629 |
- if use x86 || use amd64 ; then |
630 |
- sed -i \ |
631 |
- -e '/ttyS[01]/s:9600:115200:' \ |
632 |
- inittab |
633 |
- fi |
634 |
- if [[ ${#insert[@]} -gt 0 ]] ; then |
635 |
- printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab |
636 |
- fi |
637 |
-} |
638 |
- |
639 |
-src_compile() { |
640 |
- local myconf |
641 |
- |
642 |
- tc-export CC |
643 |
- append-lfs-flags |
644 |
- export DISTRO= #381311 |
645 |
- use static && append-ldflags -static |
646 |
- use selinux && myconf=WITH_SELINUX=yes |
647 |
- emake -C src ${myconf} || die |
648 |
-} |
649 |
- |
650 |
-src_install() { |
651 |
- emake -C src install ROOT="${D}" |
652 |
- dodoc README doc/* |
653 |
- |
654 |
- insinto /etc |
655 |
- doins "${WORKDIR}"/inittab |
656 |
- |
657 |
- # dead symlink |
658 |
- rm -f "${D}"/usr/bin/lastb |
659 |
- |
660 |
- doinitd "${FILESDIR}"/{reboot,shutdown}.sh |
661 |
-} |
662 |
- |
663 |
-pkg_postinst() { |
664 |
- # Reload init to fix unmounting problems of / on next reboot. |
665 |
- # This is really needed, as without the new version of init cause init |
666 |
- # not to quit properly on reboot, and causes a fsck of / on next reboot. |
667 |
- if [[ ${ROOT} == / ]] ; then |
668 |
- # Do not return an error if this fails |
669 |
- /sbin/telinit U &>/dev/null |
670 |
- fi |
671 |
- |
672 |
- elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to" |
673 |
- elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps." |
674 |
-} |