From e53a98716127eb7be20f46713a7442d5b8820633 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 26 Feb 2024 23:40:45 +0000 Subject: gentoo auto-resync : 26:02:2024 - 23:40:45 --- sys-apps/Manifest.gz | Bin 50825 -> 50826 bytes sys-apps/sysvinit/Manifest | 9 +- sys-apps/sysvinit/files/sysvinit-2.86-kexec.patch | 142 --------------- .../files/sysvinit-2.94_beta-shutdown-single.patch | 39 ---- sys-apps/sysvinit/files/sysvinit-3.07-halt.patch | 53 ------ sys-apps/sysvinit/sysvinit-3.07-r2.ebuild | 199 --------------------- sys-apps/sysvinit/sysvinit-3.07.ebuild | 188 ------------------- sys-apps/sysvinit/sysvinit-3.08.ebuild | 4 +- 8 files changed, 3 insertions(+), 631 deletions(-) delete mode 100644 sys-apps/sysvinit/files/sysvinit-2.86-kexec.patch delete mode 100644 sys-apps/sysvinit/files/sysvinit-2.94_beta-shutdown-single.patch delete mode 100644 sys-apps/sysvinit/files/sysvinit-3.07-halt.patch delete mode 100644 sys-apps/sysvinit/sysvinit-3.07-r2.ebuild delete mode 100644 sys-apps/sysvinit/sysvinit-3.07.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index 342d3b92eeb1..4fd591e89939 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest index 018ee1048acb..706b1e448b95 100644 --- a/sys-apps/sysvinit/Manifest +++ b/sys-apps/sysvinit/Manifest @@ -2,15 +2,8 @@ AUX bootlogd.confd 71 BLAKE2B 5ead856ebc0af512d47b410dc4197b3287594943e535dd29c9 AUX bootlogd.initd 276 BLAKE2B afc0ce0406b38d9d29398f054668f78f0d90994421b3a8a1be97ea7d2f909a6675ddfbbe8aa21918acf1147bbb147c0d2465825ec13d86c82c85320f6a5d97e9 SHA512 e2e7edcd896900eb5860310af29233b29f438a5d5c07a5ab459da2ff9117cbb21c2f9b8f17f6817068c5444b4cd5d255a2197912907c1af39bdd23d1d6e10641 AUX halt.sh 101 BLAKE2B f3b8a24b6efce0ccffeb76f401af9f9bce752a541ea646dd6d357eaaa834be2049411148ec18b591283d85f42b0c3c1e41f442ba95c5f5b4cd9e87b39a83d51e SHA512 aaf46f9c74ae58027e59f32e5e929ff6529206d07fdf4e3f17962ccbc46c68d34e4e2839019708a763dead93b83ca8f457379491830ab43d6407247fd7ac2a77 AUX inittab-2.98-r1 2124 BLAKE2B 57e40e8410a31ec73f581e2feb142c600e2ce687745a6135961c0f1ea31e77f1acf9b9be1cf4c1d55685802a913304056cf1f137686f14d89caa9ec973d751c2 SHA512 6ce22ba933158d1a0fc7d0eaa9536b1cdcd8baa90cddfe8b1bf7a1f7292ba7fc14b6b46968848301a2e573939b4e21ce8d64bf3a9eaeb4d038de7d113fd3b9fb -AUX sysvinit-2.86-kexec.patch 3910 BLAKE2B fb62326925c78960142123da82ffd1de6319153cce234b0d1dc7546beecf67296f8b7d6e3eb0f633d8a4ebc83fc4cc586c4f92cdb48df1f766aa4af72b0fa0e1 SHA512 6ce3adf698554d15394edbe6dbfc62822859854d503b201c9f96bd81c2a8cd249ed44229a85dd8b97f454f9311abc5792e349f5cc512ff6d5570500d88044bee -AUX sysvinit-2.94_beta-shutdown-single.patch 1261 BLAKE2B 571b7cf40ccdbb27e65b31e507ea8331ae1e9b8b012570cdc4099a15c864f2abc92f84c44ef9dbd35dfe43c68e491d347266abaa0156536edae4c35231f17ccb SHA512 2f26201e8634b380dafdf42678cd0241a93f0e473f5c8680d4206d97dfe3510c2ceeb4cd066d1af3ae97fe411f7a5452a9586f8f5c5e65653bf9241fea1edaf0 -AUX sysvinit-3.07-halt.patch 2085 BLAKE2B 6cf746ff84d9d4fb499e1751d26de1bcf646c14792f0f13de2a84b8dfeeaf92d67e4e66d28ffbf06733a2fb51b2ac8df155ef37c19a3fc012ce22db22c297133 SHA512 89becb9874111679a86bdcc066ab5de6087a48961871ad25aaea3e9b129cf7131d02b7d8b3599832eded9cd5e8c7c39b520c63d54ecacdb5d6617375af8a6ebc AUX sysvinit-3.08-shutdown-single.patch 1341 BLAKE2B f0b2ac2e803a3521f0473ab50b18aec300ad0c4566c0f0a53924b32540e862437ee5d99c3f54fe453e84d9ebe8011f64e75f60ca1f73cc9606b30a867df68e7d SHA512 7b3ba5c8af1e25ecc59568e920446da66fd53284e2bca0eb4b8cae2f9b919552c254e74c7363bb3598f2a35a413dcb31008dd8cae57ceaf98f6bf8921918cce7 -DIST sysvinit-3.07.tar.xz 263352 BLAKE2B 51943290c5f41ac6eb421a3ee1529d07bc127a44306973a2f3180079a28119001ad6b44c25156986fe249dd025f5eb1929189edfb5da72ee4fa64b5fd4cd5993 SHA512 57d8365ae9ab4e3b6ab948d1ac9a4f1fe86c4e86c06ea3b12fca7f7be88ef39b5e04787fbfec9417aaf06cff0db3a90e18e6a6135e205f7eb74a5e7c897491fd -DIST sysvinit-3.07.tar.xz.sig 833 BLAKE2B 7a05a2d44a7006f61bb41abc8ae3d5207cc4558156e5cc553cc9477f4d1366bf847013e22c382aa9112b6c4c9c33d4a5465e73ca810a041c459a927d710dfadc SHA512 50047ce638fd5af19c3894c4dfcada3e1b2e359331b18f6dbc5f526e91f250b736625877362c7741dbd83c9fee79ec8e4e7a57c4aa72102c017b23518064733a DIST sysvinit-3.08.tar.xz 268296 BLAKE2B ec4a4ff3663ac7d67808b50b67631ff4fe1ab56d376df15868df0eb79cbc329b192af124380eec6a797d827c3c7c5586058310d803f42ee1934dcffbfbe876f7 SHA512 a523e030e559ecc56391f9424e240fbe54a714bb3c522ca0bb410b649a1c08c5e9f03d298340a5586565f18d8640b1b418fa09294b41fb95a9cd2a686316b758 DIST sysvinit-3.08.tar.xz.sig 833 BLAKE2B b1cbe8a95faa16a22e92e2a8841643aeaf7a5a31cc9fa9628a7ee2400aac1b3a184ae01f09c75d48d5d55a71f7e62feb25c16345644bfb4fcd19cbd061f86573 SHA512 1af105d84b98428766cc315d8dea068e6c5a7ad52008291ba7c1d5accbcaeead4999fd714fc152c1038e54953f9b469bd0f792a0830e68c3e2f43afcd36e0e2d -EBUILD sysvinit-3.07-r2.ebuild 5893 BLAKE2B b387077b916948c4a5e1263203a1176a626f91ee36806ecbb22a514907db54e8e0077a151c0c7d148fc67c39cdcc56db30069d8a247816ff71d7de7983790d54 SHA512 9e9e1340b72a62cfaebc70efce5ab78ff7657e10db1f44544ac0b08f8b07a0d5a2b4b5c064d7dd36493fc430f3c41d1b8e28b464d97a94f305c76191f7a74648 -EBUILD sysvinit-3.07.ebuild 5518 BLAKE2B 6e0d544b965767ceb4133adaf7fbbdc428dc941000a3ee9f553ef34c5dfd958709845e4ed4eea312fbdcced98dfd9083be6310113e89f00c1cb4a2e11d739b99 SHA512 2db146adde6e4b60d9fa102f738f437c2fb250de451811ed5c457e2eddc2863c6b6fe2aa47be2e2282337fa3482a9534d1085da956a8e876be1792efa9205ebc -EBUILD sysvinit-3.08.ebuild 5744 BLAKE2B 5d22769b11a3aa421a98641dc6cc54e8bf1d2ef88fc2e1084474308d8996f93aa656730b4ecef60bcbd7221fa4c91367ce4861f0b988fdb88734a73fd84eb298 SHA512 7beae55695a00ba7aff10e65a079c4dc4787dd86dde60c2e770d56563fe2bb38c448c361d36b6d076a6efb30f76c2b58a39ea21c77fdce8efa618773e151862d +EBUILD sysvinit-3.08.ebuild 5746 BLAKE2B c7acb1f56678d8861090defc934ff624a022a2326dc28184907795d9382b761256fda930ed5775e987780293bc3fb72a60732bf2439a9ef2c9e4257e14eac440 SHA512 02319602e198409bb586f5fc59ed8e05cfdcb1921cbd38d76e1d9267962e7e6b69db56756eeca3991de97d6f8a92bdc7c97baa42bd3637b5a31c8b2e82ac6a95 MISC metadata.xml 506 BLAKE2B ea180981d7eafbe8356b6d187c7c1c12afc7ef91d94f7992489ad54f459c924b009bfe7c7888bf1934b356091489285dbda9eee39ab14f318528e0738da6474c SHA512 b5451236ce138c372e32c1f5e4bc25fca9acb05063720d6b452e81b19a7661058b791f6fc95a9f585244ba44ff307d07f6be49aadf1dbb461492575e2af80a89 diff --git a/sys-apps/sysvinit/files/sysvinit-2.86-kexec.patch b/sys-apps/sysvinit/files/sysvinit-2.86-kexec.patch deleted file mode 100644 index 4948806d9eb9..000000000000 --- a/sys-apps/sysvinit/files/sysvinit-2.86-kexec.patch +++ /dev/null @@ -1,142 +0,0 @@ -halt: add a -k kexec flag - ---- a/man/halt.8 -+++ b/man/halt.8 -@@ -40,6 +40,7 @@ halt, reboot, poweroff \- stop the system. - .RB [ \-d ] - .RB [ \-f ] - .RB [ \-i ] -+.RB [ \-k ] - .br - .B /sbin/poweroff - .RB [ \-n ] -@@ -83,6 +84,8 @@ Put all hard drives on the system in stand-by mode just before halt or power-off - .IP \fB\-p\fP - When halting the system, switch off the power. This is the default when halt is - called as \fBpoweroff\fP. -+.IP \fB\-k\fP -+Try to reboot using \fBkexec\fP, if kernel supports it. - .\"}}} - .\"{{{ Diagnostics - .SH DIAGNOSTICS ---- a/src/halt.c -+++ b/src/halt.c -@@ -8,7 +8,7 @@ - * execute an "shutdown -r". This is for compatibility with - * sysvinit 2.4. - * -- * Usage: halt [-n] [-w] [-d] [-f] [-h] [-i] [-p] -+ * Usage: halt [-n] [-w] [-d] [-f] [-h] [-i] [-p] [-k] - * -n: don't sync before halting the system - * -w: only write a wtmp reboot record and exit. - * -d: don't write a wtmp record. -@@ -16,6 +16,7 @@ - * -h: put harddisks in standby mode - * -i: shut down all network interfaces. - * -p: power down the system (if possible, otherwise halt). -+ * -k: reboot the system using kexec. - * - * Reboot and halt are both this program. Reboot - * is just a link to halt. Invoking the program -@@ -74,8 +75,10 @@ extern void write_wtmp(char *user, char *id, int pid, int type, char *line); - */ - void usage(void) - { -- fprintf(stderr, "usage: %s [-n] [-w] [-d] [-f] [-h] [-i]%s\n", -- progname, strcmp(progname, "halt") ? "" : " [-p]"); -+ fprintf(stderr, "usage: %s [-n] [-w] [-d] [-f] [-h] [-i]%s%s\n", -+ progname, -+ strcmp(progname, "halt") ? "" : " [-p]", -+ strcmp(progname, "reboot") ? "" : " [-k]"); - fprintf(stderr, "\t-n: don't sync before halting the system\n"); - fprintf(stderr, "\t-w: only write a wtmp reboot record and exit.\n"); - fprintf(stderr, "\t-d: don't write a wtmp record.\n"); -@@ -84,6 +87,8 @@ void usage(void) - fprintf(stderr, "\t-i: shut down all network interfaces.\n"); - if (!strcmp(progname, "halt")) - fprintf(stderr, "\t-p: power down the system (if possible, otherwise halt).\n"); -+ if (!strcmp(progname, "reboot")) -+ fprintf(stderr, "\t-k: reboot the system using kexec.\n"); - exit(1); - } - -@@ -182,6 +187,7 @@ int main(int argc, char **argv) - int do_ifdown = 0; - int do_hddown = 0; - int do_poweroff = 0; -+ int do_kexec = 0; - int c; - char *tm = NULL; - -@@ -201,7 +207,7 @@ int main(int argc, char **argv) - /* - * Get flags - */ -- while((c = getopt(argc, argv, ":ihdfnpwt:")) != EOF) { -+ while((c = getopt(argc, argv, ":ihdfnpwkt:")) != EOF) { - switch(c) { - case 'n': - do_sync = 0; -@@ -225,6 +231,9 @@ int main(int argc, char **argv) - case 'p': - do_poweroff = 1; - break; -+ case 'k': -+ do_kexec = 1; -+ break; - case 't': - tm = optarg; - break; -@@ -242,10 +251,24 @@ int main(int argc, char **argv) - (void)chdir("/"); - - if (!do_hard && !do_nothing) { -+ c = get_runlevel(); -+ -+ /* -+ * We can't reboot using kexec through this path. -+ */ -+ if (c != '6' && do_reboot && do_kexec) { -+ fprintf(stderr, "ERROR: using -k at this" -+ " runlevel requires also -f\n" -+ " (You probably want instead to reboot" -+ " normally and let your reboot\n" -+ " script, usually /etc/init.d/reboot," -+ " specify -k)\n"); -+ exit(1); -+ } -+ - /* - * See if we are in runlevel 0 or 6. - */ -- c = get_runlevel(); - if (c != '0' && c != '6') - do_shutdown(do_reboot ? "-r" : "-h", tm); - } -@@ -277,6 +300,15 @@ int main(int argc, char **argv) - if (do_nothing) exit(0); - - if (do_reboot) { -+ /* -+ * kexec or reboot -+ */ -+ if (do_kexec) -+ init_reboot(BMAGIC_KEXEC); -+ -+ /* -+ * Fall through if failed -+ */ - init_reboot(BMAGIC_REBOOT); - } else { - /* ---- a/src/reboot.h -+++ b/src/reboot.h -@@ -47,5 +47,8 @@ - # define BMAGIC_POWEROFF BMAGIC_HALT - #endif - -+/* for kexec support */ -+#define BMAGIC_KEXEC 0x45584543 -+ - #define init_reboot(magic) reboot(magic) - diff --git a/sys-apps/sysvinit/files/sysvinit-2.94_beta-shutdown-single.patch b/sys-apps/sysvinit/files/sysvinit-2.94_beta-shutdown-single.patch deleted file mode 100644 index 9aa85229eee1..000000000000 --- a/sys-apps/sysvinit/files/sysvinit-2.94_beta-shutdown-single.patch +++ /dev/null @@ -1,39 +0,0 @@ -This patch makes shutdown use the Single User runlevel by default so -the gettys are shutdown too. - -Roy Marples - -Forward-ported from v2.86 to v2.94_beta -Lars Wendler - ---- sysvinit-2.94/man/shutdown.8 -+++ sysvinit-2.94/man/shutdown.8 -@@ -44,7 +44,7 @@ - \fBshutdown\fP does its job by signalling the \fBinit\fP process, - asking it to change the runlevel. - Runlevel \fB0\fP is used to halt the system, runlevel \fB6\fP is used --to reboot the system, and runlevel \fB1\fP is used to put to system into -+to reboot the system, and runlevel \fBS\fP is used to put to system into - a state where administrative tasks can be performed; this is the default - if neither the \fI-h\fP or \fI-r\fP flag is given to \fBshutdown\fP. - To see which actions are taken on halt or reboot see the appropriate ---- sysvinit-2.94/src/shutdown.c -+++ sysvinit-2.94/src/shutdown.c -@@ -547,7 +547,7 @@ - usage(); - exit(1); - } -- strcpy(down_level, "1"); -+ strcpy(down_level, "S"); - halttype = NULL; - memset(when, '\0', WHEN_SIZE); - -@@ -734,6 +734,8 @@ - strncpy(newstate, "for reboot", STATELEN); - break; - case '1': -+ case 'S': -+ case 's': - strncpy(newstate, "to maintenance mode", STATELEN); - break; - default: diff --git a/sys-apps/sysvinit/files/sysvinit-3.07-halt.patch b/sys-apps/sysvinit/files/sysvinit-3.07-halt.patch deleted file mode 100644 index 4e65a912ccde..000000000000 --- a/sys-apps/sysvinit/files/sysvinit-3.07-halt.patch +++ /dev/null @@ -1,53 +0,0 @@ -https://github.com/slicer69/sysvinit/pull/18 -https://bugs.gentoo.org/911257 - -From fca101c2ff428eb765958ae6e3aaa0eb1adc0fdf Mon Sep 17 00:00:00 2001 -From: Jesse -Date: Thu, 27 Jul 2023 00:39:53 -0300 -Subject: [PATCH] Floppym provided patch which causes the halt command to call - "shutdown -h -H" instead of "shutdown -h" when halt is invoked without - parameters. This forces the shutdown command to set the INIT_HALT variable - and assume, unless other conditions apply, that the "halt" call really wants - to halt the machine and INIT_HALT should be set. In other words we assume - halt wants to halt unless told otherwise. Addresses downstream Gentoo bug ID - 911257. - ---- - doc/Changelog | 11 +++++++++++ - src/halt.c | 4 ++-- - 2 files changed, 13 insertions(+), 2 deletions(-) - -diff --git a/doc/Changelog b/doc/Changelog -index c00f6ef..b902756 100644 ---- a/doc/Changelog -+++ b/doc/Changelog -@@ -1,3 +1,14 @@ -+sysvinit (3.08) unreleased; urgency=low -+ * Floppym provided patch which causes the halt command -+ to call "shutdown -h -H" instead of "shutdown -h" when -+ halt is invoked without parameters. This forces the shutdown -+ command to set the INIT_HALT variable and assume, unless other -+ conditions apply, that the "halt" call really wants to halt the -+ machine and INIT_HALT should be set. In other words we -+ assume halt wants to halt unless told otherwise. -+ Addresses downstream Gentoo bug ID 911257. -+ -+ - sysvinit (3.07) released; urgency=low - * Fixed killall5 so that processes in the omit list are - not sent any signals, including SIGSTOP. -diff --git a/src/halt.c b/src/halt.c -index a469147..9bd3a4d 100644 ---- a/src/halt.c -+++ b/src/halt.c -@@ -162,8 +162,8 @@ void do_shutdown(char *fl, int should_poweroff, char *tm) - - args[i++] = "shutdown"; - args[i++] = fl; -- if ( (! strcmp(fl, "-h") ) && (should_poweroff) ) -- args[i++] = "-P"; -+ if (! strcmp(fl, "-h")) -+ args[i++] = (should_poweroff ? "-P" : "-H"); - if (tm) { - args[i++] = "-t"; - args[i++] = tm; diff --git a/sys-apps/sysvinit/sysvinit-3.07-r2.ebuild b/sys-apps/sysvinit/sysvinit-3.07-r2.ebuild deleted file mode 100644 index cba58217087d..000000000000 --- a/sys-apps/sysvinit/sysvinit-3.07-r2.ebuild +++ /dev/null @@ -1,199 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Dropped these because blank as of 3.02 -#PLOCALES="de es fi fr hu id pl" -PLOCALES="de es fr pl" -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/sysvinit.asc -inherit toolchain-funcs flag-o-matic plocale verify-sig - -DESCRIPTION="/sbin/init - parent of all processes" -HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit" -# https://github.com/slicer69/sysvinit/issues/12 -#SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz" -#SRC_URI+=" verify-sig? ( mirror://nongnu/${PN}/${P/_/-}.tar.xz.sig )" -SRC_URI="https://github.com/slicer69/sysvinit/releases/download/${PV}/${P}.tar.xz" -SRC_URI+=" verify-sig? ( https://github.com/slicer69/sysvinit/releases/download/${PV}/${P}.tar.xz.sig )" -S="${WORKDIR}/${P/_*}" - -LICENSE="GPL-2" -SLOT="0" -if [[ ${PV} != *beta* ]] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -fi -IUSE="selinux ibm nls static" - -COMMON_DEPEND=" - acct-group/root - selinux? ( - >=sys-libs/libselinux-1.28 - )" -DEPEND="${COMMON_DEPEND} - virtual/os-headers" -# Old OpenRC blocker is for bug #587424 -# Keep for longer than usual given it's cheap and avoid user inconvenience -RDEPEND="${COMMON_DEPEND} - !::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:\::g' \ - src/Makefile || die - - # logsave is already in e2fsprogs - sed -i -r \ - -e '/^(USR)?S?BIN/s:\::g' \ - -e '/^MAN8/s:\::g' \ - src/Makefile || die - - # Munge inittab for specific architectures - cd "${WORKDIR}" || die - cp "${FILESDIR}"/inittab-2.98-r1 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 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 - - delete_unused_locale() { - local locale=${1} - - einfo "Deleting non-requested man page translations for locale=${locale}" - rm "${S}"/man/{po/,}${locale}.po || die - rm -rf "${S}"/man/${locale} || die - - sed -i -e "/^\[po4a_langs\]/ s:${locale}::" "${S}"/man/po/po4a.cfg || die - } - - plocale_for_each_disabled_locale delete_unused_locale -} - -src_compile() { - tc-export CC - - append-lfs-flags - - # bug #381311 - export DISTRO= - export VERSION="${PV}" - - use static && append-ldflags -static - emake -C src $(usex selinux 'WITH_SELINUX=yes' '') - - if use nls && [[ -n "$(plocale_get_locales)" ]] ; then - cd man/po || die - po4a po4a.cfg || die - fi -} - -src_install() { - emake -C src install ROOT="${D}" - dodoc README doc/* - - insinto /etc - doins "${WORKDIR}"/inittab - - newinitd "${FILESDIR}"/bootlogd.initd bootlogd - newconfd "${FILESDIR}"/bootlogd.confd bootlogd - - into / - dosbin "${FILESDIR}"/halt.sh - - keepdir /etc/inittab.d - - if use nls && [[ -n "$(plocale_get_locales)" ]] ; then - install_locale_man_pages() { - doman -i18n=${1} man/po/${1}/* - } - - plocale_for_each_locale install_locale_man_pages - fi - - # 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 - - local ver - for ver in ${REPLACING_VERSIONS}; do - ver_test ${ver} -ge 3.07-r2 && continue - ewarn "Previously, the 'halt' command caused the system to power off" - ewarn "even if option -p was not given. This long-standing bug has" - ewarn "been fixed, and the command now behaves as documented." - break - done -} diff --git a/sys-apps/sysvinit/sysvinit-3.07.ebuild b/sys-apps/sysvinit/sysvinit-3.07.ebuild deleted file mode 100644 index 0d8ffacb778a..000000000000 --- a/sys-apps/sysvinit/sysvinit-3.07.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# Dropped these because blank as of 3.02 -#PLOCALES="de es fi fr hu id pl" -PLOCALES="de es fr pl" -VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/sysvinit.asc -inherit toolchain-funcs flag-o-matic plocale verify-sig - -DESCRIPTION="/sbin/init - parent of all processes" -HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit" -# https://github.com/slicer69/sysvinit/issues/12 -#SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz" -#SRC_URI+=" verify-sig? ( mirror://nongnu/${PN}/${P/_/-}.tar.xz.sig )" -SRC_URI="https://github.com/slicer69/sysvinit/releases/download/${PV}/${P}.tar.xz" -SRC_URI+=" verify-sig? ( https://github.com/slicer69/sysvinit/releases/download/${PV}/${P}.tar.xz.sig )" -S="${WORKDIR}/${P/_*}" - -LICENSE="GPL-2" -SLOT="0" -if [[ ${PV} != *beta* ]] ; then - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" -fi -IUSE="selinux ibm nls static" - -COMMON_DEPEND=" - acct-group/root - selinux? ( - >=sys-libs/libselinux-1.28 - )" -DEPEND="${COMMON_DEPEND} - virtual/os-headers" -# Old OpenRC blocker is for bug #587424 -# Keep for longer than usual given it's cheap and avoid user inconvenience -RDEPEND="${COMMON_DEPEND} - !::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:\::g' \ - src/Makefile || die - - # logsave is already in e2fsprogs - sed -i -r \ - -e '/^(USR)?S?BIN/s:\::g' \ - -e '/^MAN8/s:\::g' \ - src/Makefile || die - - # Munge inittab for specific architectures - cd "${WORKDIR}" || die - cp "${FILESDIR}"/inittab-2.98-r1 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 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 - - delete_unused_locale() { - local locale=${1} - - einfo "Deleting non-requested man page translations for locale=${locale}" - rm "${S}"/man/{po/,}${locale}.po || die - rm -rf "${S}"/man/${locale} || die - - sed -i -e "/^\[po4a_langs\]/ s:${locale}::" "${S}"/man/po/po4a.cfg || die - } - - plocale_for_each_disabled_locale delete_unused_locale -} - -src_compile() { - tc-export CC - - append-lfs-flags - - # bug #381311 - export DISTRO= - export VERSION="${PV}" - - use static && append-ldflags -static - emake -C src $(usex selinux 'WITH_SELINUX=yes' '') - - if use nls && [[ -n "$(plocale_get_locales)" ]] ; then - cd man/po || die - po4a po4a.cfg || die - fi -} - -src_install() { - emake -C src install ROOT="${D}" - dodoc README doc/* - - insinto /etc - doins "${WORKDIR}"/inittab - - newinitd "${FILESDIR}"/bootlogd.initd bootlogd - newconfd "${FILESDIR}"/bootlogd.confd bootlogd - - into / - dosbin "${FILESDIR}"/halt.sh - - keepdir /etc/inittab.d - - if use nls && [[ -n "$(plocale_get_locales)" ]] ; then - install_locale_man_pages() { - doman -i18n=${1} man/po/${1}/* - } - - plocale_for_each_locale install_locale_man_pages - fi - - # 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 -} diff --git a/sys-apps/sysvinit/sysvinit-3.08.ebuild b/sys-apps/sysvinit/sysvinit-3.08.ebuild index f5abf9ccf170..e0191c1ef4c4 100644 --- a/sys-apps/sysvinit/sysvinit-3.08.ebuild +++ b/sys-apps/sysvinit/sysvinit-3.08.ebuild @@ -141,7 +141,7 @@ src_compile() { } src_install() { - emake -C src install ROOT="${D}" + emake -C src install ROOT="${ED}" dodoc README doc/* insinto /etc @@ -173,7 +173,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 [[ -z ${ROOT} ]] ; then + if [[ -z ${EROOT} ]] ; then if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then ln -s /dev/initctl /run/initctl \ || ewarn "Failed to set /run/initctl symlink!" -- cgit v1.2.3