diff options
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild | 2 | ||||
| -rw-r--r-- | sys-apps/dbus-broker/Manifest | 15 | ||||
| -rw-r--r-- | sys-apps/dbus-broker/dbus-broker-25.ebuild (renamed from sys-apps/dbus-broker/dbus-broker-23.ebuild) | 16 | ||||
| -rw-r--r-- | sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild | 2 | ||||
| -rw-r--r-- | sys-apps/sysvinit/Manifest | 3 | ||||
| -rw-r--r-- | sys-apps/sysvinit/files/inittab-2.98 | 65 | ||||
| -rw-r--r-- | sys-apps/sysvinit/sysvinit-2.93.ebuild | 1 | ||||
| -rw-r--r-- | sys-apps/sysvinit/sysvinit-2.96.ebuild | 3 | ||||
| -rw-r--r-- | sys-apps/sysvinit/sysvinit-2.97.ebuild (renamed from sys-apps/sysvinit/sysvinit-2.95-r1.ebuild) | 14 | ||||
| -rw-r--r-- | sys-apps/sysvinit/sysvinit-2.98.ebuild | 144 |
10 files changed, 241 insertions, 24 deletions
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild index 3609b72802bb..32353c78d609 100644 --- a/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild +++ b/sys-apps/baselayout-prefix/baselayout-prefix-2.6-r2.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} = 9999 ]]; then inherit git-r3 else SRC_URI="https://gitweb.gentoo.org/proj/${MY_PN}.git/snapshot/${MY_P}.tar.bz2" - KEYWORDS="~arm ~arm64 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" + KEYWORDS="~arm ~arm64 ~ppc64 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" fi LICENSE="GPL-2" diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest index bc2a1237b094..5c6d8e60b3c1 100644 --- a/sys-apps/dbus-broker/Manifest +++ b/sys-apps/dbus-broker/Manifest @@ -1,16 +1,15 @@ -DIST c-dvar-9e1a5b4363aaece7169df2b2852944a1434b2df5.tar.gz 24719 BLAKE2B 3688d10d8295bf608d091cbc808dd2a22a535a94d40fcad46735a4f9e6e58ac06f969cd4ae7e65a04dd5719d00b424d902d904553e3e83bd0b93eebf6aed0cc0 SHA512 07e5d8b0b110ae4eab34024cfef05474b6a59a931ce61632bba3d96ed6bf042edf5b21238e2045cde92f1ab91ed45b1d78e2f8fe79f527f0ab6d018dc205608e +DIST c-dvar-70f0f21e86a34577e674e202d5d09ef167102f02.tar.gz 24719 BLAKE2B 817c03739f56a3b741120896f98089bd6a379395b2f8e99697a79a3a2bdc855358a73b079434428c416373821e0e134acf6e30ef9bb9a384d25438c633e02433 SHA512 6a237100e66eef2413bf498d97a8fe1ca1b568df1f99276603f0b1627437a7f5741c38068cbafc49664f2a0438785a0ef7fb1de0fdb6768741585f1606d094e2 DIST c-dvar-ebcef28b0da11ec20250f2fa710130967ddd8fa9.tar.gz 24584 BLAKE2B 6b9d488b14861084aa48a874d0db97d90ef554df4877650f66631474b12cd9c7d595726e074de4ddc549d7e053984aaa02f0cc0543811842fac468b2e3c3b8a4 SHA512 592ac99b75101e24babb0ab08ede530bf4cd3a31780d7da1e4d4ace04878811ab2db324c91dd962d6d9e433cd05658cc467a272d9ff3d17e2f594bfe08998b3e -DIST c-ini-43f379396a320940d0661c15780f618f84d29348.tar.gz 14081 BLAKE2B 4d2b63eb5c068505cfddaa1511b95b1a3c646b7325e9efd55b4b5be85312081c148671e40157c757c45ab0128f0a486102267dddf1c3adbc8f91bb7da363a67a SHA512 bdc9412f2e43446f4dcc36f3447047c68f2bbd3c5b278671e3fb5b3d4a09d9724f362bc5d2fae44d5f899d0fe9978c559e3da57ec2eb36ee2d847bbf6af44014 +DIST c-ini-867f06a12a702c6869924575503877caa0adde75.tar.gz 13950 BLAKE2B 2cec6d49f7e698ee7f9514f8726c7c01dc72d2c186832122efcabeea37e082d0922be742c83f69c1ef93a820575c05dc2bb10790b41c2491e8c3719afbe5a37a SHA512 a3e82a24dc8119d90d573d87f5d92f24029490cae1564f66030f6781c95fa50c2c720378a8fbd07511007f1f53debbf62ca9ea86fdd905c42f325f28f35bd876 DIST c-ini-f8336c98a74038a1104283fde284c5b82d6aef92.tar.gz 13957 BLAKE2B 7e0bb2d8b5cd8cdf2aefa48b9e8980327690bbc255937b12b54133014aac9473ddab517a126a0f24a2258cffc263043d643ccacb99c41bb666e4d0c18e62899e SHA512 5abba94f47f5155464e28b4f99ff147f1cd029db9b020c579508eec0f3e9d6be09462a56ed8b9320a4d8ccc0d03a8f959cdb9098fcd828c917f37e2deda90e1c DIST c-list-ac7c831398219acd8d63038e866035a6f86f9e21.tar.gz 9218 BLAKE2B 5821032f60a27c696b0e34e2d26250c48df19ad0d8883eb50b5a0ee6acafeb3f570b23db7b0c823ecdd47de6eb0d2d02d5aedf467283e8293e848189af8d59ae SHA512 95a3e03b0b3aefcdaaf350de0b41cdbba081716ff01bf6e2442aaf0340f0411f32f6a06d204614b59af26df921a161b4bee5f83b5145ec2cae485c9954a6709c -DIST c-list-b1cd4dbf967d73b24dfe6cc56aaf3fdd668692e3.tar.gz 9362 BLAKE2B 04a1bca5166ad8b868ebac679e4a1c1f244bfc04ea617030a7cd9ea3765793d21cc2b1ab6c102a1e0fec65860b4d029f398ab6f9815f8fbec82608da59eb7794 SHA512 e1a852fa8e57f1fbe81f2fdc186079d6e4be9d729bb23d3d1f8450fd867dd2c04db3229fc96a80379c7199568c14df472e92a83d0925e2b2692eccc49a35b84d DIST c-rbtree-7624b79b26d020a796fe7c624a4f2d3340f3d66b.tar.gz 25835 BLAKE2B 080f8cc5168b40fcc87a3b21f8b8130385f6ccaafe1c229dca4b9a2e8b6294e7100784f9d2e12c336172e5eaa93645f41379e96bf85c622f0c46f27ad9dbaa65 SHA512 e231a040aedbd12309c4b57cd78fbbe931460fd0748f4a7d0f88ebbe5a0f088bdc6f473be94a5e9d9a28c0a8bf31d81a7a9669132b7eddb44a51a9a2e598cbb0 -DIST c-rbtree-fa97402c3faa18c2ddd8325eb66e2bd58a224477.tar.gz 26050 BLAKE2B 2e295550f455185eb97d1f3212d626bc7df94999fc065e814fdaa8c8d3cd14eb288f840e9cee04842cf1dc4b541a88a043d1f70eee36b77fa82f15430335372f SHA512 1fcafde26da46511dd7141280d14d96d7dd08fb7f62f71c2703c8fdb32783f9e6eac883a4adbdfb0b85139d26f89ce99291a28e789a4ec8c31e4a4560c584418 -DIST c-shquote-1d171fe52c23944c3c0be1f2603595f2488a9ff8.tar.gz 10758 BLAKE2B 1f78587e667b74cdb0dcaf82f54fc891840b75b4fff478bf315b5a45b421875ea43b07504330c35cc31c68956899d5c8e1768dcaf863ef6ece23ac56734b8479 SHA512 a0788dcbd7cdab95577564b499cca3ca1039d2b22bb05f277e84ff3868f1f80796ef26236b5aa082057169d8a9f69781f06792f9a3ae8e869d5d721931f3c882 +DIST c-rbtree-a3b1f80548d1c736208c55e9251c49ada649dd62.tar.gz 25948 BLAKE2B 82e3692fd747191fc160ae5add4e037696f9209f7ef3003bcb72def18c96a7368b5e6408d38de6c0609ef27fa6762d9323a85e0ab5d1a50d8b10cca99b2930d1 SHA512 9ab0c6062e5cfb771c4f31a9c8d82f744762d2f9acf24849bcc6f04de57e85fc0f8487ef8c8484e2e0f0baec83a3011b1425ddd183c2836f90906636f1db8d94 DIST c-shquote-80d4252f31c74785f0ec8c4578a26f1c16d5941e.tar.gz 10639 BLAKE2B 9a0f64e0af692a0872b5f40236543e551b7eb49134fc31ca6bfcf56b36e5eba1c2445093a089bf4eaa1aa89671270b35a7cf20767377b167c1cc2cec8f72a23a SHA512 1a79cf2c7c5d3f0d901a3947e371717314b1a4015eb0182b3b670c65abf9c054f30870ec73c628d7b2519b506035be45c23267594e76bc3b7d2e6b53a38cb068 -DIST c-stdaux-d6ecce8afbb7703e1469cc5e7a59a8bd32e2d4a4.tar.gz 13142 BLAKE2B 771c79666d4758e37204aec1149186af8b1b29979ae604b335d3b5e0f78ee934c5fa97e81aa7e4cd19f8eb88f463c2f4a507b93309ae263fae827ee5138c7ac6 SHA512 c486bdddf76522e8242da46b8057a5ee9c9f5f152962a46bb50e0e2e35be5060b8b93d0b2a0d0bcd800abdf8de6e835e68d17d83dc47c6c99e7e0b2f4d91db23 +DIST c-shquote-95e4713a0de475688a5727a5d776dccbc69d3d28.tar.gz 10635 BLAKE2B 90dd5c343dcc7de13a7cc5a495052c058499fb7fcdf44d5463a45714ea8e330fc3c9756c84302f454cd46ef32801b74962d9e49ab930ebc6729cbdb1de9e8056 SHA512 494c55cb676998afc56e40f00661f49698e596a51019e9f227b111b4f16d7f2e65056adc57858c688957a07c972dadd217af2bbb95e390760ef758259e54a769 +DIST c-stdaux-346623b40eb8137cae7568a69ee42253ff098ff7.tar.gz 13046 BLAKE2B 19b22cc7cb6f4a5a970295a36ceecadf8d1fbd93524a39a22107c73df63516c643be711483aa0ca3fdb97941a9a41084802def7c6663824e7660908564f3ad96 SHA512 424512e8818ff56a9882806aa9879f4f5167ed02a19d01cffb42de620816318746898c27d9ccb857b466435d1a588d735ff51da45baa08f9b892dcef18ec34ce DIST c-stdaux-ffa3dcc365331e31eb0c0f73ccd258e7a29a162a.tar.gz 13000 BLAKE2B 23f5a264aa4a8c70e8562c62d4c4a3a865e5132febc9709576d4e565a72c171131c0d6292bb9d39a40cf5f3caa2dd6226a5c2e2bb763dd05c0e32e14f8a85725 SHA512 ac51a94b49db7b77c40fc3c1da74ee4a2a5fc8200f51e45d298cff2540fc7de0a348a028709562b8361f99c1978c37fac2de46941c2bd0ce31dabf80d405c042 -DIST c-utf8-1f7e2ff1164bd2161cb480532b2b34cb2074bde1.tar.gz 9462 BLAKE2B 3e1429da756f82123c3aec84c2abdf02af3e131e9004a59434bf6743173082fa4a0c6d43def625da03bf0de1b3c5cfd6f00719dcfb5baced783b3d9dbbc407e6 SHA512 4221c3d366d3cb8bd61a612fcadafbc48ae817cd4770c2710a39b5bdb916a31b8ba17ca55ccac5e54ed88ee9bbcc4a9bbb3ce5b836ccfc570db28d35816cee27 DIST c-utf8-9017bab6cef301229e2295bdcb19476466065788.tar.gz 9332 BLAKE2B 34c97e01305b45ae0370b15d9c9e6257497fa9954889252f0344e5d2418d054bed07060b92fd22434581d9d9b8875a4771dd60db161447e7e402e75ff073daee SHA512 11b4eb7342f844bf65205e87de18ef96b685f50884d39dc0a00db2d1f99489d463b3c4a4f196e08c9a7dd39be7e0b372a27c3a666658f6e4a5e03951fb1b4596 -DIST dbus-broker-23.tar.gz 209924 BLAKE2B 44f966c04c34c4dec9916224038418203b55013f07f95331b6143aaf3e4d0a5add8e76a288627f9c6458326fabf4e9db9c235190d281c4ed01a7a325c90bcece SHA512 42bcb085e153f81d59ac8f1dccd707aa1da98d01f5299eeb2fac2f12bad3fd7aa3268a489f4e1dc827c0e3f7000f11989394047ffee3c3c4da9f50bc6d12dfac +DIST c-utf8-af5bf7f330078d285e5f58584abd6de01c4cfd7d.tar.gz 9331 BLAKE2B 32b6da3f92e25d3971abea08f336856f44e9180e73d776058c473a8140ad519b7b614177445f4e143e56276795d04127ec8c8c01561935683227fb2c391a51cd SHA512 84ee285d90d1a899a75e1fc63931d10ff1b652bb06b19b0916afd0a3af5c359628e2ec2951ca987a8a6e6cdfbe73a286bd5a664c24e9998ada6c29f3c34752ce DIST dbus-broker-24.tar.gz 210347 BLAKE2B 037ccb389bf1df6dfcc600e363c604d498bff9b5e37ff10f5040acca4917fcd96c03552d769fcf87e50927bac17b8d1fe70f3ec8835c744166518791cc725d81 SHA512 81819f496dd34a43b16e1b3bcc982bb9b8574aec061fef7831b259c2649b05ed8c866795f815de9eb7aff940404811f8b235832121dfabb0672de9b76acb09d8 +DIST dbus-broker-25.tar.gz 210739 BLAKE2B 6abf0a38fba3af41d95c4c1deea4c5d5b974bc1d0918d4b5ff317c08dd8e097212d966b76a76dad9674129f9babd00bd9c44d09b1d36fd25acb11298a10b0819 SHA512 bdeb0b002153234729a34f4163549f7589cb6ab03776cf6ab8956a5560fb7a6e089b4654913afd68d6c267036cd8b684e698075c06ee30aed7fb778394121a80 diff --git a/sys-apps/dbus-broker/dbus-broker-23.ebuild b/sys-apps/dbus-broker/dbus-broker-25.ebuild index 509831015999..93084e63543f 100644 --- a/sys-apps/dbus-broker/dbus-broker-23.ebuild +++ b/sys-apps/dbus-broker/dbus-broker-25.ebuild @@ -9,16 +9,16 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git" else - KEYWORDS="~amd64" + KEYWORDS="~amd64" # ~ppc64 SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz" declare -Ag SUBPROJECTS=( - [c-dvar]=9e1a5b4363aaece7169df2b2852944a1434b2df5 - [c-ini]=43f379396a320940d0661c15780f618f84d29348 - [c-list]=b1cd4dbf967d73b24dfe6cc56aaf3fdd668692e3 - [c-rbtree]=fa97402c3faa18c2ddd8325eb66e2bd58a224477 - [c-shquote]=1d171fe52c23944c3c0be1f2603595f2488a9ff8 - [c-stdaux]=d6ecce8afbb7703e1469cc5e7a59a8bd32e2d4a4 - [c-utf8]=1f7e2ff1164bd2161cb480532b2b34cb2074bde1 + [c-dvar]=70f0f21e86a34577e674e202d5d09ef167102f02 + [c-ini]=867f06a12a702c6869924575503877caa0adde75 + [c-list]=ac7c831398219acd8d63038e866035a6f86f9e21 + [c-rbtree]=a3b1f80548d1c736208c55e9251c49ada649dd62 + [c-shquote]=95e4713a0de475688a5727a5d776dccbc69d3d28 + [c-stdaux]=346623b40eb8137cae7568a69ee42253ff098ff7 + [c-utf8]=af5bf7f330078d285e5f58584abd6de01c4cfd7d ) for sp in "${!SUBPROJECTS[@]}"; do commit=${SUBPROJECTS[${sp}]} diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild index 9c424d2704ec..f947df99e6b7 100644 --- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild +++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${P LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86" IUSE="selinux test" RESTRICT="!test? ( test )" diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest index 5b792f16a0e6..8dce800e3d05 100644 --- a/sys-apps/sysvinit/Manifest +++ b/sys-apps/sysvinit/Manifest @@ -1,3 +1,4 @@ DIST sysvinit-2.93.tar.xz 117580 BLAKE2B 2e771b00dbdc73e76df9e78659aaa5e5fcbfda36290a1b5aa20a5a6fe3540c4616f2a235a668de30d33c620e2d2516da303537eda47b83b29b0844ad7aa77df4 SHA512 c80d07a674253d15ec6382cfaf792f47486e2e84ab9c913d3c9e03b590cf211177a3a14e168f4d1c9c2e97737221f7ac70a75633d90502837a6d29bdc4c48d72 -DIST sysvinit-2.95.tar.xz 124576 BLAKE2B 1b0770e3bc7c5a32b8a634ab70d16854446816f9c22f57befb2602a8680d5d4a4adc51747b6199867ba73a3ac5118073a8bfa9ea4317de86b3b42867ae0cf6e7 SHA512 367990d166ec6dcc4de81e748f15035e2a4c2838da7336b064aeadac2db95ca77e8d11fb6aa7e7745874ef3e27118c9a68070062fffb16a886f32d6ab2529d28 DIST sysvinit-2.96.tar.xz 122164 BLAKE2B 10c28d3bb57fc744b66c3a7ac78912fb6a9d987e9f6f32f82953d23a9884020daa6fa8c7722e6d8145d9899f7f7dc623f69f885d3d8fbbcd313d0e69ffb66497 SHA512 1388398568ebfe53460796f8ab75a3ead6111612888ea36e8f1c0db4d41ef6f45fc217abb7804519ff1143a78d97c95b24e42c8c22c95a47b9436484bfb6f45d +DIST sysvinit-2.97.tar.xz 126848 BLAKE2B dd2612de531a89f1fdbfaeb8b5975aeba9541a6b570587a881bdb11406991c1a9b254d1802725298eb13362d625d3859b520ee964782a0fe43d3f038a28b49e6 SHA512 89950080a120b62bdd297f3a59898dd11e10c7438cf18774bad16c65ce5fb2e190726e601c6f263def32cff59867c0984edcd99d527eb80297901085afbb2e90 +DIST sysvinit-2.98.tar.xz 127028 BLAKE2B 302219cd0753dee20772d78ad073e279f430ededab93feaecd166d9be9f91f0f5e97fcfe3e5893d9db963ba638e66e1f6670a94f6e2328fbfdb92325563a129c SHA512 37bc3279b58ce3d808abb78eb6aa8c18a55f991343cc66316ad5b8c2fbb8dce95b83dd995cdab1df8c82a5ab155d0ad65bc3cee3860e4ba4ba4f8c2ac865c3f7 diff --git a/sys-apps/sysvinit/files/inittab-2.98 b/sys-apps/sysvinit/files/inittab-2.98 new file mode 100644 index 000000000000..7608db85d5fa --- /dev/null +++ b/sys-apps/sysvinit/files/inittab-2.98 @@ -0,0 +1,65 @@ +# +# /etc/inittab: This file describes how the INIT process should set up +# the system in a certain run-level. +# +# Author: Miquel van Smoorenburg, <miquels@cistron.nl> +# Modified by: Patrick J. Volkerding, <volkerdi@ftp.cdrom.com> +# Modified by: Daniel Robbins, <drobbins@gentoo.org> +# Modified by: Martin Schlemmer, <azarah@gentoo.org> +# Modified by: Mike Frysinger, <vapier@gentoo.org> +# Modified by: Robin H. Johnson, <robbat2@gentoo.org> +# Modified by: William Hubbs, <williamh@gentoo.org> +# Modified by: Lars Wendler, <polynomial-c@gentoo.org> +# + +# Default runlevel. +id:3:initdefault: + +# System initialization, mount local filesystems, etc. +si::sysinit:/sbin/openrc sysinit + +# Further system initialization, brings up the boot runlevel. +rc::bootwait:/sbin/openrc boot + +l0u:0:wait:/sbin/telinit u +l0:0:wait:/sbin/openrc shutdown +l0s:0:wait:/sbin/halt.sh +l1:1:wait:/sbin/openrc single +l2:2:wait:/sbin/openrc nonetwork +l3:3:wait:/sbin/openrc default +l4:4:wait:/sbin/openrc default +l5:5:wait:/sbin/openrc default +l6u:6:wait:/sbin/telinit u +l6:6:wait:/sbin/openrc reboot +l6r:6:wait:/sbin/reboot -dkn +#z6:6:respawn:/sbin/sulogin + +# new-style single-user +su0:S:wait:/sbin/openrc single +su1:S:wait:/sbin/sulogin + +# TERMINALS +#x1:12345:respawn:/sbin/agetty 38400 console linux +c1:12345:respawn:/sbin/agetty --noclear 38400 tty1 linux +c2:2345:respawn:/sbin/agetty 38400 tty2 linux +c3:2345:respawn:/sbin/agetty 38400 tty3 linux +c4:2345:respawn:/sbin/agetty 38400 tty4 linux +c5:2345:respawn:/sbin/agetty 38400 tty5 linux +c6:2345:respawn:/sbin/agetty 38400 tty6 linux + +# SERIAL CONSOLES +#s0:12345:respawn:/sbin/agetty -L 9600 ttyS0 vt100 +#s1:12345:respawn:/sbin/agetty -L 9600 ttyS1 vt100 + +# What to do at the "Three Finger Salute". +ca:12345:ctrlaltdel:/sbin/shutdown -r now + +# Halt system on power failures +pf:12345:powerwait:/sbin/halt + +# Used by /etc/init.d/xdm to control DM startup. +# Read the comments in /etc/init.d/xdm for more +# info. Do NOT remove, as this will start nothing +# extra at boot if /etc/init.d/xdm is not added +# to the "default" runlevel. +x:a:once:/etc/X11/startDM.sh diff --git a/sys-apps/sysvinit/sysvinit-2.93.ebuild b/sys-apps/sysvinit/sysvinit-2.93.ebuild index 5ac31ac8f54b..c9bc3963c511 100644 --- a/sys-apps/sysvinit/sysvinit-2.93.ebuild +++ b/sys-apps/sysvinit/sysvinit-2.93.ebuild @@ -1,3 +1,4 @@ +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/sys-apps/sysvinit/sysvinit-2.96.ebuild b/sys-apps/sysvinit/sysvinit-2.96.ebuild index 9c43035eb92b..b82c9e06198e 100644 --- a/sys-apps/sysvinit/sysvinit-2.96.ebuild +++ b/sys-apps/sysvinit/sysvinit-2.96.ebuild @@ -1,3 +1,4 @@ +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -120,7 +121,7 @@ pkg_postinst() { # Reload init to fix unmounting problems of / on next reboot. # This is really needed, as without the new version of init cause init # not to quit properly on reboot, and causes a fsck of / on next reboot. - if [[ ${ROOT} == / ]] ; then + if [[ -z ${ROOT} ]] ; then if [[ -e /dev/initctl && ! -e /run/initctl ]]; then ln -s /dev/initctl /run/initctl fi diff --git a/sys-apps/sysvinit/sysvinit-2.95-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.97.ebuild index 9c43035eb92b..9a08cbac04aa 100644 --- a/sys-apps/sysvinit/sysvinit-2.95-r1.ebuild +++ b/sys-apps/sysvinit/sysvinit-2.97.ebuild @@ -1,3 +1,4 @@ +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz" LICENSE="GPL-2" SLOT="0" [[ "${PV}" == *beta* ]] || \ -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86" IUSE="selinux ibm static kernel_FreeBSD" CDEPEND=" @@ -114,15 +115,20 @@ src_install() { newinitd "${FILESDIR}"/bootlogd.initd bootlogd into / dosbin "${FILESDIR}"/halt.sh + + keepdir /etc/inittab.d + + find "${ED}" -type d -empty -delete || die } pkg_postinst() { # Reload init to fix unmounting problems of / on next reboot. # This is really needed, as without the new version of init cause init # not to quit properly on reboot, and causes a fsck of / on next reboot. - if [[ ${ROOT} == / ]] ; then - if [[ -e /dev/initctl && ! -e /run/initctl ]]; then - ln -s /dev/initctl /run/initctl + if [[ -z ${ROOT} ]] ; then + if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then + ln -s /dev/initctl /run/initctl \ + || ewarn "Failed to set /run/initctl symlink!" fi # Do not return an error if this fails /sbin/telinit U &>/dev/null diff --git a/sys-apps/sysvinit/sysvinit-2.98.ebuild b/sys-apps/sysvinit/sysvinit-2.98.ebuild new file mode 100644 index 000000000000..b2d86e1da2d6 --- /dev/null +++ b/sys-apps/sysvinit/sysvinit-2.98.ebuild @@ -0,0 +1,144 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs flag-o-matic + +DESCRIPTION="/sbin/init - parent of all processes" +HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit" +SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +[[ "${PV}" == *beta* ]] || \ +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +IUSE="selinux ibm static kernel_FreeBSD" + +CDEPEND=" + selinux? ( + >=sys-libs/libselinux-1.28 + )" +DEPEND="${CDEPEND} + virtual/os-headers" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-shutdown ) + !<sys-apps/openrc-0.13 +" + +S="${WORKDIR}/${P/_*}" + +PATCHES=( + "${FILESDIR}/${PN}-2.86-kexec.patch" #80220 + "${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch" #158615 + "${FILESDIR}/${PN}-2.95_beta-shutdown-h.patch" #449354 +) + +src_prepare() { + default + + sed -i \ + -e '/^CPPFLAGS =$/d' \ + -e '/^override CFLAGS +=/s/ -fstack-protector-strong//' \ + src/Makefile || die + + # last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux + sed -i -r \ + -e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \ + -e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \ + src/Makefile || die + + # pidof has moved to >=procps-3.3.9 + sed -i -r \ + -e '/\/bin\/pidof/d' \ + -e '/^MAN8/s:\<pidof.8\>::g' \ + src/Makefile || die + + # logsave is already in e2fsprogs + sed -i -r \ + -e '/^(USR)?S?BIN/s:\<logsave\>::g' \ + -e '/^MAN8/s:\<logsave.8\>::g' \ + src/Makefile || die + + # Mung inittab for specific architectures + cd "${WORKDIR}" || die + cp "${FILESDIR}"/inittab-2.98 inittab || die "cp inittab" + local insert=() + use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' ) + use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' ) + use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' ) + use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' ) + use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' ) + if use ibm ; then + insert+=( + '#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0' + '#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0' + ) + fi + (use arm || use mips || use sparc) && sed -i '/ttyS0/s:#::' inittab + if use kernel_FreeBSD ; then + sed -i \ + -e 's/linux/cons25/g' \ + -e 's/ttyS0/cuaa0/g' \ + -e 's/ttyS1/cuaa1/g' \ + inittab #121786 + fi + if use x86 || use amd64 ; then + sed -i \ + -e '/ttyS[01]/s:9600:115200:' \ + inittab + fi + if [[ ${#insert[@]} -gt 0 ]] ; then + printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab + fi +} + +src_compile() { + tc-export CC + append-lfs-flags + export DISTRO= #381311 + export VERSION="${PV}" + use static && append-ldflags -static + emake -C src $(usex selinux 'WITH_SELINUX=yes' '') +} + +src_install() { + emake -C src install ROOT="${D}" + dodoc README doc/* + + insinto /etc + doins "${WORKDIR}"/inittab + + newinitd "${FILESDIR}"/bootlogd.initd bootlogd + into / + dosbin "${FILESDIR}"/halt.sh + + keepdir /etc/inittab.d + + # dead symlink + find "${ED}" -xtype l -delete || die + + find "${ED}" -type d -empty -delete || die +} + +pkg_postinst() { + # Reload init to fix unmounting problems of / on next reboot. + # This is really needed, as without the new version of init cause init + # not to quit properly on reboot, and causes a fsck of / on next reboot. + if [[ -z ${ROOT} ]] ; then + if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then + ln -s /dev/initctl /run/initctl \ + || ewarn "Failed to set /run/initctl symlink!" + fi + # Do not return an error if this fails + /sbin/telinit U &>/dev/null + fi + + elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to" + elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps." + + # Required for new bootlogd service + if [[ ! -e "${EROOT}/var/log/boot" ]] ; then + touch "${EROOT}/var/log/boot" + fi +} |
