[gentoo-commits] repo/gentoo:master commit in: sys-apps/s6-linux-init/

[Sam James]

commit:     a3b3441098db053eedf2882c45fe9205814caacc
Author:     Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Sun Jan 23 14:34:01 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jan 28 07:59:15 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3b34410

sys-apps/s6-linux-init: add 1.0.7.1

-fno-stack-protector flag was removed from configure script in upstream
in version 1.0.6.0.

Upstream-commit: 5cda6f5fdc8f ("Don't put -fno-stack-protector in default CFLAGS")
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-apps/s6-linux-init/Manifest                    |  1 +
 .../s6-linux-init/s6-linux-init-1.0.7.1.ebuild     | 74 ++++++++++++++++++++++
 2 files changed, 75 insertions(+)

diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index 521c16d3d02c..3d6e31c1b67b 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1 +1,2 @@
 DIST s6-linux-init-1.0.4.2.tar.gz 52731 BLAKE2B d9565921c7e3a786c3c9cdd1aae5cc8c1b0939d857b1da668443e756f39c5e454a618d6fc572490e37a01581dae44b799f8df6972701b8d91a947a05695ab604 SHA512 31dfe6911f6de527c43120097bd711cfb84cdec6f056ccaa03d48a1bcecb852caacdbaabddf0188ea30c4827abe3293acb8ebff8dfe80ea8665934802fac0e53
+DIST s6-linux-init-1.0.7.1.tar.gz 58373 BLAKE2B 02d2a3898882a41adea85dfcc3f0e03636dac16758aea88c09bb0309d61fa86526d8e678e0a24b915949d7b76e77b558809be65ccc7b0c0156b852c3d1a587ba SHA512 92ef82c00cd8e6de92adccfe1c61ef23130458f912a6c9a7d52447584a775660446bdef1954bbff3042ecba3de9587fb2dab8e329bc96a8e55b486668b4aaf64

diff --git a/sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild
new file mode 100644
index 000000000000..2ce334d05831
--- /dev/null
+++ b/sys-apps/s6-linux-init/s6-linux-init-1.0.7.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Generates an init binary for s6-based init systems"
+HOMEPAGE="https://www.skarnet.org/software/s6-linux-init/"
+SRC_URI="https://www.skarnet.org/software/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="static static-libs +sysv-utils"
+
+REQUIRED_USE="static? ( static-libs )"
+
+RDEPEND=">=dev-lang/execline-2.8.2.0:=[static-libs?]
+	>=dev-libs/skalibs-2.11.1.0:=[static-libs?]
+	>=sys-apps/s6-2.11.0.1:=[execline,static-libs?]
+	sysv-utils? (
+		!sys-apps/systemd[sysv-utils]
+		!sys-apps/sysvinit
+	)
+"
+DEPEND="${RDEPEND}"
+
+HTML_DOCS=( doc/. )
+
+src_prepare() {
+	default
+
+	# Avoid QA warning for LDFLAGS addition
+	sed -i -e 's/.*-Wl,--hash-style=both$/:/' configure || die
+
+	sed -i -e '/AR := /d' -e '/RANLIB := /d' Makefile || die
+}
+
+src_configure() {
+	tc-export AR CC RANLIB
+
+	local myconf=(
+		--bindir=/bin
+		--dynlibdir=/usr/$(get_libdir)
+		--skeldir=/etc/s6-linux-init/skel
+		--libdir=/usr/$(get_libdir)/${PN}
+		--with-dynlib=/usr/$(get_libdir)
+		--with-lib=/usr/$(get_libdir)/s6
+		--with-lib=/usr/$(get_libdir)/skalibs
+		--with-sysdeps=/usr/$(get_libdir)/skalibs
+		--enable-shared
+		$(use_enable static allstatic)
+		$(use_enable static static-libc)
+		$(use_enable static-libs static)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	if use sysv-utils ; then
+		"${D}/bin/s6-linux-init-maker" -f "${D}/etc/s6-linux-init/skel" "${T}/dir" || die
+		into /
+		dosbin "${T}/dir/bin"/{halt,poweroff,reboot,shutdown,telinit}
+	fi
+}
+
+pkg_postinst() {
+	einfo "Read ${EROOT}/usr/share/doc/${PF}/html/quickstart.html"
+	einfo "for usage instructions."
+}