public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/musl:master commit in: sys-apps/sysvinit/
@ 2020-09-04 23:46 Georgy Yakovlev
  0 siblings, 0 replies; 9+ messages in thread
From: Georgy Yakovlev @ 2020-09-04 23:46 UTC (permalink / raw
  To: gentoo-commits

commit:     3a278ef016a00a20eaadba44444631970fba0ddd
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  4 23:46:06 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Sep  4 23:46:06 2020 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=3a278ef0

sys-apps/sysvinit: remove sh references

gentoo sh port discontinued.
ebuild fails with

USE Flag 'sh' not in IUSE for sys-apps/sysvinit-2.93

Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 sys-apps/sysvinit/sysvinit-2.93.ebuild | 2 +-
 sys-apps/sysvinit/sysvinit-2.94.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/sysvinit/sysvinit-2.93.ebuild b/sys-apps/sysvinit/sysvinit-2.93.ebuild
index 7102f0d..9b6df22 100644
--- a/sys-apps/sysvinit/sysvinit-2.93.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.93.ebuild
@@ -68,7 +68,7 @@ src_prepare() {
 			'#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
 		)
 	fi
-	(use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab
+	(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:' \

diff --git a/sys-apps/sysvinit/sysvinit-2.94.ebuild b/sys-apps/sysvinit/sysvinit-2.94.ebuild
index 152c296..5260eeb 100644
--- a/sys-apps/sysvinit/sysvinit-2.94.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.94.ebuild
@@ -74,7 +74,7 @@ src_prepare() {
 			'#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0'
 		)
 	fi
-	(use arm || use mips || use sh || use sparc) && sed -i '/ttyS0/s:#::' inittab
+	(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:' \


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-apps/sysvinit/
@ 2020-12-07 14:13 Jory Pratt
  0 siblings, 0 replies; 9+ messages in thread
From: Jory Pratt @ 2020-12-07 14:13 UTC (permalink / raw
  To: gentoo-commits

commit:     249632e576e27c2071e5b6f786c1ea700299d19d
Author:     stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Fri Dec  4 19:20:18 2020 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Dec  7 14:11:59 2020 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=249632e5

sys-apps/sysvinit: drop all keywords but x86

x86 has broken stack protector on musl, all other arches are fine

Signed-off-by: Steffen Kuhn <nielson2 <AT> yandex.com>
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 sys-apps/sysvinit/sysvinit-2.93.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/sysvinit/sysvinit-2.93.ebuild b/sys-apps/sysvinit/sysvinit-2.93.ebuild
index bd8282f..f36bbba 100644
--- a/sys-apps/sysvinit/sysvinit-2.93.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.93.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *beta* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ppc ppc64 x86"
+KEYWORDS="x86"
 IUSE="selinux ibm static"
 
 CDEPEND="


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-apps/sysvinit/
@ 2020-12-07 14:13 Jory Pratt
  0 siblings, 0 replies; 9+ messages in thread
From: Jory Pratt @ 2020-12-07 14:13 UTC (permalink / raw
  To: gentoo-commits

commit:     fd9eb11062b7dc4d6ac1d9dc779322abe8e4cf26
Author:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  7 14:13:00 2020 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Dec  7 14:13:00 2020 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=fd9eb110

sys-apps/sysvinit: cleanup whitespace and unneeded blank line

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 sys-apps/sysvinit/sysvinit-2.97.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sys-apps/sysvinit/sysvinit-2.97.ebuild b/sys-apps/sysvinit/sysvinit-2.97.ebuild
index e7338ae..d64e729 100644
--- a/sys-apps/sysvinit/sysvinit-2.97.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.97.ebuild
@@ -53,11 +53,10 @@ src_prepare() {
 		-e '/\/bin\/pidof/d' \
 		-e '/^MAN8/s:\<pidof.8\>::g' \
 		src/Makefile || die
-		
+
 	# stack protector is broken on x86 musl
 	sed -i 's/-fstack-protector-strong//' src/Makefile || die
 
-
 	# logsave is already in e2fsprogs
 	sed -i -r \
 		-e '/^(USR)?S?BIN/s:\<logsave\>::g' \


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-apps/sysvinit/
@ 2020-12-03 16:17 Jory Pratt
  0 siblings, 0 replies; 9+ messages in thread
From: Jory Pratt @ 2020-12-03 16:17 UTC (permalink / raw
  To: gentoo-commits

commit:     c5c10c1b3d7dd46c4dc3251faa6b915f04b38da9
Author:     stefson <herrtimson <AT> yahoo <DOT> de>
AuthorDate: Thu Dec  3 13:55:58 2020 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Thu Dec  3 16:17:00 2020 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=c5c10c1b

sys-apps/sysvinit: fix typo in documentation

Closes: https://github.com/gentoo/musl/pull/364

Signed-off-by: Steffen Kuhn <nielson2 <AT> yandex.com>
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 sys-apps/sysvinit/sysvinit-2.93.ebuild | 2 +-
 sys-apps/sysvinit/sysvinit-2.94.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/sysvinit/sysvinit-2.93.ebuild b/sys-apps/sysvinit/sysvinit-2.93.ebuild
index 9b6df22..bd8282f 100644
--- a/sys-apps/sysvinit/sysvinit-2.93.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.93.ebuild
@@ -50,7 +50,7 @@ src_prepare() {
 		-e '/^MAN8/s:\<pidof.8\>::g' \
 		src/Makefile || die
 
-	# stack protector is broken no x86 musl
+	# stack protector is broken on x86 musl
 	sed -i 's/-fstack-protector-strong//' src/Makefile || die
 
 	# Mung inittab for specific architectures

diff --git a/sys-apps/sysvinit/sysvinit-2.94.ebuild b/sys-apps/sysvinit/sysvinit-2.94.ebuild
index 5260eeb..b168492 100644
--- a/sys-apps/sysvinit/sysvinit-2.94.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.94.ebuild
@@ -50,7 +50,7 @@ src_prepare() {
 		-e '/^MAN8/s:\<pidof.8\>::g' \
 		src/Makefile || die
 
-	# stack protector is broken no x86 musl
+	# stack protector is broken on x86 musl
 	sed -i 's/-fstack-protector-strong//' src/Makefile || die
 
 	# logsave is already in e2fsprogs


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-apps/sysvinit/
@ 2020-01-30  7:42 Georgy Yakovlev
  0 siblings, 0 replies; 9+ messages in thread
From: Georgy Yakovlev @ 2020-01-30  7:42 UTC (permalink / raw
  To: gentoo-commits

commit:     2222ece6ce00ac1641464cb7d615fd220bfa6440
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 30 05:46:25 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu Jan 30 05:46:25 2020 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=2222ece6

sys-apps/sysvinit: restore ppc64 keyword

Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 sys-apps/sysvinit/sysvinit-2.93.ebuild | 4 ++--
 sys-apps/sysvinit/sysvinit-2.94.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-apps/sysvinit/sysvinit-2.93.ebuild b/sys-apps/sysvinit/sysvinit-2.93.ebuild
index 54eafc4..7102f0d 100644
--- a/sys-apps/sysvinit/sysvinit-2.93.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.93.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *beta* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ppc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ppc ppc64 x86"
 IUSE="selinux ibm static"
 
 CDEPEND="

diff --git a/sys-apps/sysvinit/sysvinit-2.94.ebuild b/sys-apps/sysvinit/sysvinit-2.94.ebuild
index 7f1c6f4..152c296 100644
--- a/sys-apps/sysvinit/sysvinit-2.94.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.94.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *beta* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
 IUSE="selinux ibm static"
 
 CDEPEND="


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-apps/sysvinit/
@ 2019-05-04 15:07 Anthony G. Basile
  0 siblings, 0 replies; 9+ messages in thread
From: Anthony G. Basile @ 2019-05-04 15:07 UTC (permalink / raw
  To: gentoo-commits

commit:     cd9c0cf7f9cdab20c1e666513324afc8b71a84e2
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sat May  4 15:06:33 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sat May  4 15:06:57 2019 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=cd9c0cf7

sys-apps/sysvinit: stable 2.93 needed for ppc

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 sys-apps/sysvinit/sysvinit-2.93.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/sysvinit/sysvinit-2.93.ebuild b/sys-apps/sysvinit/sysvinit-2.93.ebuild
index e4bba86..93c711f 100644
--- a/sys-apps/sysvinit/sysvinit-2.93.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.93.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *beta* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ppc x86"
 IUSE="selinux ibm static kernel_FreeBSD"
 
 CDEPEND="


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-apps/sysvinit/
@ 2019-03-10 16:02 Anthony G. Basile
  0 siblings, 0 replies; 9+ messages in thread
From: Anthony G. Basile @ 2019-03-10 16:02 UTC (permalink / raw
  To: gentoo-commits

commit:     b6312fc0aab61f227d8a3af2637fc133e52f2f43
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 10 15:54:03 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 15:54:03 2019 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=b6312fc0

sys-apps/sysvinit: 2.93 stable for x86

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 sys-apps/sysvinit/sysvinit-2.93.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/sysvinit/sysvinit-2.93.ebuild b/sys-apps/sysvinit/sysvinit-2.93.ebuild
index e654f1f..e4bba86 100644
--- a/sys-apps/sysvinit/sysvinit-2.93.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.93.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *beta* ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc x86"
 IUSE="selinux ibm static kernel_FreeBSD"
 
 CDEPEND="


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-apps/sysvinit/
@ 2019-03-10 16:02 Anthony G. Basile
  0 siblings, 0 replies; 9+ messages in thread
From: Anthony G. Basile @ 2019-03-10 16:02 UTC (permalink / raw
  To: gentoo-commits

commit:     1f88ae96ca26c021357e3fa2c4012c26ca96dc05
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 10 15:53:15 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Mar 10 15:53:15 2019 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=1f88ae96

sys-apps/sysvinit: bump to 2.93 and 2.94

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 sys-apps/sysvinit/Manifest             |   2 +
 sys-apps/sysvinit/sysvinit-2.93.ebuild | 130 +++++++++++++++++++++++++++++++
 sys-apps/sysvinit/sysvinit-2.94.ebuild | 136 +++++++++++++++++++++++++++++++++
 3 files changed, 268 insertions(+)

diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index 59f5d29..d2cce31 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -1,2 +1,4 @@
 DIST sysvinit-2.91.tar.xz 114412 BLAKE2B 5e044f589f5001c2b5a30eda76bf5c24bb2a7e0d308b7027d54031848407e6b7667b59096044eb186a7f6a862521d4a670c05a17dcc929d07da6515058949606 SHA512 8dcf6de79b03567c300ef5f2b7dd211895745e231510d730092085a15f61f06f28cee7c504b0b022bdcb4b4e903f44946537d4fbb2b5069fb5d29bb099fd45f5
 DIST sysvinit-2.92.tar.xz 117560 BLAKE2B 300c9b7dffb5a07ece9b12682bf49816143215953527b69fe80c4f7f9b487de6c812213c9a851c5636de3989889b3179ace9a17b35c985729655a7c877b67170 SHA512 1395943540bc52d999de64c426c7f807d7688166591a8104e6c8cec2f45f13e0e3dd3d182b91194402c38172f412424a6c7d8c09662b3b5169ba6f928b5592a9
+DIST sysvinit-2.93.tar.xz 117580 BLAKE2B 2e771b00dbdc73e76df9e78659aaa5e5fcbfda36290a1b5aa20a5a6fe3540c4616f2a235a668de30d33c620e2d2516da303537eda47b83b29b0844ad7aa77df4 SHA512 c80d07a674253d15ec6382cfaf792f47486e2e84ab9c913d3c9e03b590cf211177a3a14e168f4d1c9c2e97737221f7ac70a75633d90502837a6d29bdc4c48d72
+DIST sysvinit-2.94.tar.xz 120900 BLAKE2B e45a95246325e93ef49f11573924216937e238761cb9f5979ae2b272838fb3280b1d12c9553992271f7926dc7c7bc18e352a8019a70f54c592971fe043453804 SHA512 8d3b7b777f7c37cf5eaf73d4cdfad8ac54c6115577052bd7ddf3588da8fb7d16b812ffaade0ce300c2c6b7d2acd6e7778130544befc171eab174ee8766b3ec50

diff --git a/sys-apps/sysvinit/sysvinit-2.93.ebuild b/sys-apps/sysvinit/sysvinit-2.93.ebuild
new file mode 100644
index 0000000..e654f1f
--- /dev/null
+++ b/sys-apps/sysvinit/sysvinit-2.93.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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="~amd64 ~arm ~arm64 ~mips ~ppc ~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.86-shutdown-single.patch" #158615
+	"${FILESDIR}/${PN}-2.92_beta-shutdown-h.patch" #449354
+)
+
+src_prepare() {
+	default
+	sed -i '/^CPPFLAGS =$/d' 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
+
+	# stack protector is broken no x86 musl
+	sed -i 's/-fstack-protector-strong//' src/Makefile || die
+
+	# Mung inittab for specific architectures
+	cd "${WORKDIR}" || die
+	cp "${FILESDIR}"/inittab-2.91 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 sh || 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
+
+	# dead symlink
+	rm "${ED%/}"/usr/bin/lastb || die
+
+	newinitd "${FILESDIR}"/bootlogd.initd bootlogd
+}
+
+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
+		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-2.94.ebuild b/sys-apps/sysvinit/sysvinit-2.94.ebuild
new file mode 100644
index 0000000..164f28c
--- /dev/null
+++ b/sys-apps/sysvinit/sysvinit-2.94.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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="~amd64 ~arm ~arm64 ~mips ~ppc ~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.92_beta-shutdown-h.patch" #449354
+)
+
+src_prepare() {
+	default
+	sed -i '/^CPPFLAGS =$/d' 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
+
+	# stack protector is broken no x86 musl
+	sed -i 's/-fstack-protector-strong//' 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.91 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 sh || 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
+
+	# dead symlink
+	rm "${ED%/}"/usr/bin/lastb || die
+
+	newinitd "${FILESDIR}"/bootlogd.initd bootlogd
+}
+
+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
+		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
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-apps/sysvinit/
@ 2018-11-25  1:36 Anthony G. Basile
  0 siblings, 0 replies; 9+ messages in thread
From: Anthony G. Basile @ 2018-11-25  1:36 UTC (permalink / raw
  To: gentoo-commits

commit:     22a66ee3076bad59e18eb6a97baaffe85d9835a9
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 25 01:36:51 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Sun Nov 25 01:36:51 2018 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=22a66ee3

sys-apps/sysvinit: stable on x86

Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 sys-apps/sysvinit/sysvinit-2.91-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/sysvinit/sysvinit-2.91-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.91-r1.ebuild
index c16000d..5230328 100644
--- a/sys-apps/sysvinit/sysvinit-2.91-r1.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.91-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86"
+KEYWORDS="x86"
 IUSE="selinux ibm static kernel_FreeBSD"
 
 CDEPEND="


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2020-12-07 14:13 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-04 23:46 [gentoo-commits] proj/musl:master commit in: sys-apps/sysvinit/ Georgy Yakovlev
  -- strict thread matches above, loose matches on Subject: below --
2020-12-07 14:13 Jory Pratt
2020-12-07 14:13 Jory Pratt
2020-12-03 16:17 Jory Pratt
2020-01-30  7:42 Georgy Yakovlev
2019-05-04 15:07 Anthony G. Basile
2019-03-10 16:02 Anthony G. Basile
2019-03-10 16:02 Anthony G. Basile
2018-11-25  1:36 Anthony G. Basile

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox