1 |
commit: d56e495f402f34e7cb44b2cf4e836188c970a023 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 12 07:52:07 2019 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 12 07:52:19 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d56e495f |
7 |
|
8 |
sys-apps/sysvinit: Removed old |
9 |
|
10 |
Package-Manager: Portage-2.3.76, Repoman-2.3.17 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
sys-apps/sysvinit/Manifest | 1 - |
14 |
sys-apps/sysvinit/sysvinit-2.94.ebuild | 136 -------------------------------- |
15 |
sys-apps/sysvinit/sysvinit-2.95.ebuild | 137 --------------------------------- |
16 |
3 files changed, 274 deletions(-) |
17 |
|
18 |
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest |
19 |
index b7f1a12b995..5b792f16a0e 100644 |
20 |
--- a/sys-apps/sysvinit/Manifest |
21 |
+++ b/sys-apps/sysvinit/Manifest |
22 |
@@ -1,4 +1,3 @@ |
23 |
DIST sysvinit-2.93.tar.xz 117580 BLAKE2B 2e771b00dbdc73e76df9e78659aaa5e5fcbfda36290a1b5aa20a5a6fe3540c4616f2a235a668de30d33c620e2d2516da303537eda47b83b29b0844ad7aa77df4 SHA512 c80d07a674253d15ec6382cfaf792f47486e2e84ab9c913d3c9e03b590cf211177a3a14e168f4d1c9c2e97737221f7ac70a75633d90502837a6d29bdc4c48d72 |
24 |
-DIST sysvinit-2.94.tar.xz 120900 BLAKE2B e45a95246325e93ef49f11573924216937e238761cb9f5979ae2b272838fb3280b1d12c9553992271f7926dc7c7bc18e352a8019a70f54c592971fe043453804 SHA512 8d3b7b777f7c37cf5eaf73d4cdfad8ac54c6115577052bd7ddf3588da8fb7d16b812ffaade0ce300c2c6b7d2acd6e7778130544befc171eab174ee8766b3ec50 |
25 |
DIST sysvinit-2.95.tar.xz 124576 BLAKE2B 1b0770e3bc7c5a32b8a634ab70d16854446816f9c22f57befb2602a8680d5d4a4adc51747b6199867ba73a3ac5118073a8bfa9ea4317de86b3b42867ae0cf6e7 SHA512 367990d166ec6dcc4de81e748f15035e2a4c2838da7336b064aeadac2db95ca77e8d11fb6aa7e7745874ef3e27118c9a68070062fffb16a886f32d6ab2529d28 |
26 |
DIST sysvinit-2.96.tar.xz 122164 BLAKE2B 10c28d3bb57fc744b66c3a7ac78912fb6a9d987e9f6f32f82953d23a9884020daa6fa8c7722e6d8145d9899f7f7dc623f69f885d3d8fbbcd313d0e69ffb66497 SHA512 1388398568ebfe53460796f8ab75a3ead6111612888ea36e8f1c0db4d41ef6f45fc217abb7804519ff1143a78d97c95b24e42c8c22c95a47b9436484bfb6f45d |
27 |
|
28 |
diff --git a/sys-apps/sysvinit/sysvinit-2.94.ebuild b/sys-apps/sysvinit/sysvinit-2.94.ebuild |
29 |
deleted file mode 100644 |
30 |
index 51fe022e6eb..00000000000 |
31 |
--- a/sys-apps/sysvinit/sysvinit-2.94.ebuild |
32 |
+++ /dev/null |
33 |
@@ -1,136 +0,0 @@ |
34 |
-# Copyright 1999-2019 Gentoo Authors |
35 |
-# Distributed under the terms of the GNU General Public License v2 |
36 |
- |
37 |
-EAPI=6 |
38 |
- |
39 |
-inherit toolchain-funcs flag-o-matic |
40 |
- |
41 |
-DESCRIPTION="/sbin/init - parent of all processes" |
42 |
-HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit" |
43 |
-SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz" |
44 |
- |
45 |
-LICENSE="GPL-2" |
46 |
-SLOT="0" |
47 |
-[[ "${PV}" == *beta* ]] || \ |
48 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" |
49 |
-IUSE="selinux ibm static kernel_FreeBSD" |
50 |
- |
51 |
-CDEPEND=" |
52 |
- selinux? ( |
53 |
- >=sys-libs/libselinux-1.28 |
54 |
- )" |
55 |
-DEPEND="${CDEPEND} |
56 |
- virtual/os-headers" |
57 |
-RDEPEND="${CDEPEND} |
58 |
- selinux? ( sec-policy/selinux-shutdown ) |
59 |
- !<sys-apps/openrc-0.13 |
60 |
-" |
61 |
- |
62 |
-S="${WORKDIR}/${P/_*}" |
63 |
- |
64 |
-PATCHES=( |
65 |
- "${FILESDIR}/${PN}-2.86-kexec.patch" #80220 |
66 |
- "${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch" #158615 |
67 |
- "${FILESDIR}/${PN}-2.92_beta-shutdown-h.patch" #449354 |
68 |
-) |
69 |
- |
70 |
-src_prepare() { |
71 |
- default |
72 |
- sed -i \ |
73 |
- -e '/^CPPFLAGS =$/d' \ |
74 |
- -e '/^override CFLAGS +=/s/ -fstack-protector-strong//' \ |
75 |
- src/Makefile || die |
76 |
- |
77 |
- # last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux |
78 |
- sed -i -r \ |
79 |
- -e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \ |
80 |
- -e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \ |
81 |
- src/Makefile || die |
82 |
- |
83 |
- # pidof has moved to >=procps-3.3.9 |
84 |
- sed -i -r \ |
85 |
- -e '/\/bin\/pidof/d' \ |
86 |
- -e '/^MAN8/s:\<pidof.8\>::g' \ |
87 |
- src/Makefile || die |
88 |
- |
89 |
- # logsave is already in e2fsprogs |
90 |
- sed -i -r \ |
91 |
- -e '/^(USR)?S?BIN/s:\<logsave\>::g' \ |
92 |
- -e '/^MAN8/s:\<logsave.8\>::g' \ |
93 |
- src/Makefile || die |
94 |
- |
95 |
- # Mung inittab for specific architectures |
96 |
- cd "${WORKDIR}" || die |
97 |
- cp "${FILESDIR}"/inittab-2.91 inittab || die "cp inittab" |
98 |
- local insert=() |
99 |
- use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' ) |
100 |
- use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' ) |
101 |
- use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' ) |
102 |
- use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' ) |
103 |
- use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' ) |
104 |
- if use ibm ; then |
105 |
- insert+=( |
106 |
- '#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0' |
107 |
- '#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0' |
108 |
- ) |
109 |
- fi |
110 |
- (use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab |
111 |
- if use kernel_FreeBSD ; then |
112 |
- sed -i \ |
113 |
- -e 's/linux/cons25/g' \ |
114 |
- -e 's/ttyS0/cuaa0/g' \ |
115 |
- -e 's/ttyS1/cuaa1/g' \ |
116 |
- inittab #121786 |
117 |
- fi |
118 |
- if use x86 || use amd64 ; then |
119 |
- sed -i \ |
120 |
- -e '/ttyS[01]/s:9600:115200:' \ |
121 |
- inittab |
122 |
- fi |
123 |
- if [[ ${#insert[@]} -gt 0 ]] ; then |
124 |
- printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab |
125 |
- fi |
126 |
-} |
127 |
- |
128 |
-src_compile() { |
129 |
- tc-export CC |
130 |
- append-lfs-flags |
131 |
- export DISTRO= #381311 |
132 |
- export VERSION="${PV}" |
133 |
- use static && append-ldflags -static |
134 |
- emake -C src $(usex selinux 'WITH_SELINUX=yes' '') |
135 |
-} |
136 |
- |
137 |
-src_install() { |
138 |
- emake -C src install ROOT="${D}" |
139 |
- dodoc README doc/* |
140 |
- |
141 |
- insinto /etc |
142 |
- doins "${WORKDIR}"/inittab |
143 |
- |
144 |
- # dead symlink |
145 |
- rm "${ED%/}"/usr/bin/lastb || die |
146 |
- |
147 |
- newinitd "${FILESDIR}"/bootlogd.initd bootlogd |
148 |
-} |
149 |
- |
150 |
-pkg_postinst() { |
151 |
- # Reload init to fix unmounting problems of / on next reboot. |
152 |
- # This is really needed, as without the new version of init cause init |
153 |
- # not to quit properly on reboot, and causes a fsck of / on next reboot. |
154 |
- if [[ ${ROOT} == / ]] ; then |
155 |
- if [[ -e /dev/initctl && ! -e /run/initctl ]]; then |
156 |
- ln -s /dev/initctl /run/initctl |
157 |
- fi |
158 |
- # Do not return an error if this fails |
159 |
- /sbin/telinit U &>/dev/null |
160 |
- fi |
161 |
- |
162 |
- elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to" |
163 |
- elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps." |
164 |
- |
165 |
- # Required for new bootlogd service |
166 |
- if [[ ! -e "${EROOT%/}/var/log/boot" ]] ; then |
167 |
- touch "${EROOT%/}/var/log/boot" |
168 |
- fi |
169 |
-} |
170 |
|
171 |
diff --git a/sys-apps/sysvinit/sysvinit-2.95.ebuild b/sys-apps/sysvinit/sysvinit-2.95.ebuild |
172 |
deleted file mode 100644 |
173 |
index f02f81e0645..00000000000 |
174 |
--- a/sys-apps/sysvinit/sysvinit-2.95.ebuild |
175 |
+++ /dev/null |
176 |
@@ -1,137 +0,0 @@ |
177 |
-# Copyright 1999-2019 Gentoo Authors |
178 |
-# Distributed under the terms of the GNU General Public License v2 |
179 |
- |
180 |
-EAPI=7 |
181 |
- |
182 |
-inherit toolchain-funcs flag-o-matic |
183 |
- |
184 |
-DESCRIPTION="/sbin/init - parent of all processes" |
185 |
-HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit" |
186 |
-SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz" |
187 |
- |
188 |
-LICENSE="GPL-2" |
189 |
-SLOT="0" |
190 |
-[[ "${PV}" == *beta* ]] || \ |
191 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86" |
192 |
-IUSE="selinux ibm static kernel_FreeBSD" |
193 |
- |
194 |
-CDEPEND=" |
195 |
- selinux? ( |
196 |
- >=sys-libs/libselinux-1.28 |
197 |
- )" |
198 |
-DEPEND="${CDEPEND} |
199 |
- virtual/os-headers" |
200 |
-RDEPEND="${CDEPEND} |
201 |
- selinux? ( sec-policy/selinux-shutdown ) |
202 |
- !<sys-apps/openrc-0.13 |
203 |
-" |
204 |
- |
205 |
-S="${WORKDIR}/${P/_*}" |
206 |
- |
207 |
-PATCHES=( |
208 |
- "${FILESDIR}/${PN}-2.86-kexec.patch" #80220 |
209 |
- "${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch" #158615 |
210 |
- "${FILESDIR}/${PN}-2.95_beta-shutdown-h.patch" #449354 |
211 |
-) |
212 |
- |
213 |
-src_prepare() { |
214 |
- default |
215 |
- |
216 |
- sed -i \ |
217 |
- -e '/^CPPFLAGS =$/d' \ |
218 |
- -e '/^override CFLAGS +=/s/ -fstack-protector-strong//' \ |
219 |
- src/Makefile || die |
220 |
- |
221 |
- # last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux |
222 |
- sed -i -r \ |
223 |
- -e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \ |
224 |
- -e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \ |
225 |
- src/Makefile || die |
226 |
- |
227 |
- # pidof has moved to >=procps-3.3.9 |
228 |
- sed -i -r \ |
229 |
- -e '/\/bin\/pidof/d' \ |
230 |
- -e '/^MAN8/s:\<pidof.8\>::g' \ |
231 |
- src/Makefile || die |
232 |
- |
233 |
- # logsave is already in e2fsprogs |
234 |
- sed -i -r \ |
235 |
- -e '/^(USR)?S?BIN/s:\<logsave\>::g' \ |
236 |
- -e '/^MAN8/s:\<logsave.8\>::g' \ |
237 |
- src/Makefile || die |
238 |
- |
239 |
- # Mung inittab for specific architectures |
240 |
- cd "${WORKDIR}" || die |
241 |
- cp "${FILESDIR}"/inittab-2.91 inittab || die "cp inittab" |
242 |
- local insert=() |
243 |
- use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' ) |
244 |
- use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' ) |
245 |
- use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' ) |
246 |
- use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' ) |
247 |
- use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' ) |
248 |
- if use ibm ; then |
249 |
- insert+=( |
250 |
- '#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0' |
251 |
- '#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0' |
252 |
- ) |
253 |
- fi |
254 |
- (use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab |
255 |
- if use kernel_FreeBSD ; then |
256 |
- sed -i \ |
257 |
- -e 's/linux/cons25/g' \ |
258 |
- -e 's/ttyS0/cuaa0/g' \ |
259 |
- -e 's/ttyS1/cuaa1/g' \ |
260 |
- inittab #121786 |
261 |
- fi |
262 |
- if use x86 || use amd64 ; then |
263 |
- sed -i \ |
264 |
- -e '/ttyS[01]/s:9600:115200:' \ |
265 |
- inittab |
266 |
- fi |
267 |
- if [[ ${#insert[@]} -gt 0 ]] ; then |
268 |
- printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab |
269 |
- fi |
270 |
-} |
271 |
- |
272 |
-src_compile() { |
273 |
- tc-export CC |
274 |
- append-lfs-flags |
275 |
- export DISTRO= #381311 |
276 |
- export VERSION="${PV}" |
277 |
- use static && append-ldflags -static |
278 |
- emake -C src $(usex selinux 'WITH_SELINUX=yes' '') |
279 |
-} |
280 |
- |
281 |
-src_install() { |
282 |
- emake -C src install ROOT="${D}" |
283 |
- dodoc README doc/* |
284 |
- |
285 |
- insinto /etc |
286 |
- doins "${WORKDIR}"/inittab |
287 |
- |
288 |
- # dead symlink |
289 |
- rm "${ED}"/usr/bin/lastb || die |
290 |
- |
291 |
- newinitd "${FILESDIR}"/bootlogd.initd bootlogd |
292 |
-} |
293 |
- |
294 |
-pkg_postinst() { |
295 |
- # Reload init to fix unmounting problems of / on next reboot. |
296 |
- # This is really needed, as without the new version of init cause init |
297 |
- # not to quit properly on reboot, and causes a fsck of / on next reboot. |
298 |
- if [[ ${ROOT} == / ]] ; then |
299 |
- if [[ -e /dev/initctl && ! -e /run/initctl ]]; then |
300 |
- ln -s /dev/initctl /run/initctl |
301 |
- fi |
302 |
- # Do not return an error if this fails |
303 |
- /sbin/telinit U &>/dev/null |
304 |
- fi |
305 |
- |
306 |
- elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to" |
307 |
- elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps." |
308 |
- |
309 |
- # Required for new bootlogd service |
310 |
- if [[ ! -e "${EROOT}/var/log/boot" ]] ; then |
311 |
- touch "${EROOT}/var/log/boot" |
312 |
- fi |
313 |
-} |