gentoo auto-resync : 02:09:2022 - 10:16:01

6 files changed, 105 insertions, 3 deletions

diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index c97119949c6f..46cd29886d87 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/freeipmi/Manifest b/sys-libs/freeipmi/Manifest
index d532f4ccc0d7..dd7b7418eb99 100644
--- a/sys-libs/freeipmi/Manifest
+++ b/sys-libs/freeipmi/Manifest
@@ -3,6 +3,8 @@ AUX bmc-watchdog.initd.4 404 BLAKE2B 4f975fdccb09a8505d59ded187be17e52b746a5239c
 AUX freeipmi.icinga 117 BLAKE2B 12409a509d0b06d54196961f703fbe91034e1f68cfc19e5cb90c00a3481e29e8bca45fcaca2cc1d780ba5ca6deee58a06b24a2b928ce4a73067efb83d34201f8 SHA512 813aeebe5e663073f3bce7917b35c6ec493f5222bb759d47238aa2b382459661a90165b0bd3a74c2e6e1940d373eccb43ab03a4270d2d2c91a03be361ce46032
 AUX ipmidetectd.confd 185 BLAKE2B ea7164e6b126cc684482557cafae3ac0c39611484243e95a3e8946488cc234f4d3100f931549f08c917d454768845e276d83fa3f9e2d7a57c4454a55090bfa38 SHA512 f10e908a451c646b2c61338d79e69663c05216a54093745bd2b659041e0b91adb9be4077c92d63f6f3d62cb5510168b6a57e5e86375533e235fd3abb2b72a49c
 AUX ipmiseld.confd 192 BLAKE2B 52b125e63ca3e13fcb24f5b304f73c78269fc58b2c3e40cb185b28697c409ccf5ecd4b95599c38119bfe8c97977c3cc87e3633989e2b9d4095cded4b2b248dc4 SHA512 0a031f29a4692085054d5fc2dfe6d0ad7fb762f7ee96849ce2d562a90d6e3b0f3ae8328ab852dc22bee6221bc5cd8b588bd02075222038fa0f0e2f64ac185799
+DIST freeipmi-1.6.10.tar.gz 3431062 BLAKE2B e217570d8fcf78ca9d04aad4d5bd46b4120beb21f2dcfb083bc9779a4541856e08ec6e87549651ee3c9b62fe54521585e192c784254dd9482bf9da09935853ae SHA512 90b6b78cdd119c2a1f332f007333aa6df70c6e3de0fd81ab007025392ee7cb7a01ab4a7a174d1f2e760c55d78f21ebbbe9667af661ccdd669e4b54edb1346937
 DIST freeipmi-1.6.9.tar.gz 3429566 BLAKE2B 68ee7bd27d459a25464e17d9c98370252d33961d10e69675505f046db26a95d780c114b4f90eeab43a39d0fca3d98b1f108c6d3ca9550fd9d3c455d2e9a79c6b SHA512 536add8dc01aa4d9df45e3499f8be1318185b19beb579c8f991a11ca973626d7e0aabe1d8760a9addadc418ea5c1e2b5432053e46ba94fd9078fb6dcabf48280
+EBUILD freeipmi-1.6.10.ebuild 2600 BLAKE2B ff5893435ab4ea77d407d608194cee08ae23d3eb478b9f43cdff67a342c9cf79b3fc37a5a6b8e059606e5a39409f83a2e997d9c9e6d360484022839f224afa19 SHA512 f7d4686b8ab6b8a770c2d90e315dfa52b67a9d0acdf9e73e95abee33f5e8f615dbfeb1778b47c512c08cb65a6750a993c1947bbafbdd8457b845f41d10cc23e2
 EBUILD freeipmi-1.6.9.ebuild 2455 BLAKE2B 925c3025b4b87099a9a1c0c3c66504e18adbdddddd828b9c96171f59169c074e6f748961fa961a59aab3285da14a7f6883ee71bc022747ab97e328274602f4d3 SHA512 6086561f0620730d2c09ab4bfe8867bd2dc552891d69abef519da2d5ac8fdb8bea505adbfa85e3f3a369ac3d21b2fb7ea4a0419bcfb9194f6401860bc08602ab
-MISC metadata.xml 377 BLAKE2B 0c5f5f13dcdf90731feddde774186ffdd9744cbc903f43a2599d84ea19f4da93a28d1d951d15c2c268449b448d1862e0117424411a259f872739f9baa4b937ff SHA512 927dbcae26c2c6576da5e606883a98049085138e6955b3a3ef82826216521848d08a2c505d0583b9a337190f18899a805f7174bdfa46f81a099ec68761a1ce91
+MISC metadata.xml 491 BLAKE2B 68ef286925ae73be1785beb6a1f2f5727cea6e4ea68df81830c815a83dceb3c908cf1806641fe033c9e303f04be55344e3f057fde38195b2d6d6d247dad1ef60 SHA512 b0a60f96c4d33aa6655ab785d51abf2ace6f94bbb7c07766c6b9acf176efbd9008d4b8fbf02c7372f4b52eab1b09ece7c5469328003bcf353330b9e053dd5166
diff --git a/sys-libs/freeipmi/freeipmi-1.6.10.ebuild b/sys-libs/freeipmi/freeipmi-1.6.10.ebuild
new file mode 100644
index 000000000000..2b1cc92c5ba9
--- /dev/null
+++ b/sys-libs/freeipmi/freeipmi-1.6.10.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+AT_M4DIR="config"
+
+DESCRIPTION="Provides Remote-Console and System Management Software as per IPMI v1.5/2.0"
+HOMEPAGE="https://www.gnu.org/software/freeipmi/"
+
+MY_P="${P/_/.}"
+[[ ${MY_P} == *.beta* ]] && ALPHA="-alpha"
+SRC_URI="mirror://gnu${ALPHA}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~x86"
+IUSE="debug nagios without-root"
+
+RDEPEND="dev-libs/libgcrypt:0="
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+RDEPEND="${RDEPEND}
+	nagios? (
+		|| ( net-analyzer/icinga net-analyzer/nagios )
+		dev-lang/perl
+	)
+"
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable debug)
+		$(usex without-root --with-dont-check-for-root "")
+		--disable-static
+		--disable-init-scripts
+		--localstatedir="${EPREFIX}"/var
+		ac_cv_path_CPP_FOR_BUILD="$(tc-getPROG CPP cpp)"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+# There are no tests
+src_test() { :; }
+
+src_install() {
+	default
+
+	# freeipmi by defaults install _all_ commands to /usr/sbin, but
+	# quite a few can be run remotely as standard user, so move them
+	# in /usr/bin afterwards.
+	dodir /usr/bin
+	local prog
+	for prog in ipmi{detect,ping,power,console}; do
+		mv "${ED}"/usr/{s,}bin/${prog} || die
+
+		# The default install symlinks these commands to add a dash
+		# after the ipmi prefix; we repeat those after move for
+		# consistency.
+		rm "${ED}"/usr/sbin/${prog/ipmi/ipmi-}
+		dosym ${prog} /usr/bin/${prog/ipmi/ipmi-}
+	done
+
+	# Install the nagios plugin in its proper place, if desired
+	if use nagios; then
+		dodir /usr/$(get_libdir)/nagios/plugins
+		mv "${ED}"/usr/share/doc/${PF}/contrib/nagios/nagios_ipmi_sensors.pl \
+			"${ED}"/usr/$(get_libdir)/nagios/plugins/ || die
+		fperms 0755 /usr/$(get_libdir)/nagios/plugins/nagios_ipmi_sensors.pl
+
+		insinto /etc/icinga/conf.d
+		newins "${FILESDIR}"/freeipmi.icinga freeipmi-command.cfg
+	fi
+
+	dodoc AUTHORS ChangeLog* DISCLAIMER* NEWS README* TODO doc/*.txt
+
+	keepdir \
+		/var/cache/ipmiseld \
+		/var/cache/ipmimonitoringsdrcache \
+		/var/lib/freeipmi \
+		/var/log/ipmiconsole
+
+	# starting from version 1.2.0 the two daemons are similar enough
+	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 ipmidetectd
+	newconfd "${FILESDIR}"/ipmidetectd.confd ipmidetectd
+
+	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 bmc-watchdog
+	newconfd "${FILESDIR}"/bmc-watchdog.confd bmc-watchdog
+
+	newinitd "${FILESDIR}"/bmc-watchdog.initd.4 ipmiseld
+	newconfd "${FILESDIR}"/ipmiseld.confd ipmiseld
+
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-libs/freeipmi/metadata.xml b/sys-libs/freeipmi/metadata.xml
index a4cf4d39338a..71d6d4eef727 100644
--- a/sys-libs/freeipmi/metadata.xml
+++ b/sys-libs/freeipmi/metadata.xml
@@ -10,5 +10,8 @@
     <flag name="nagios">
       Install a nagios plugin to check sensors' status.
     </flag>
+    <flag name="without-root">
+      Configure whether or not to check for root access in ipmi tools.
+    </flag>
   </use>
 </pkgmetadata>
diff --git a/sys-libs/libapparmor/Manifest b/sys-libs/libapparmor/Manifest
index b644a9c1bb62..4a2f8186e23f 100644
--- a/sys-libs/libapparmor/Manifest
+++ b/sys-libs/libapparmor/Manifest
@@ -1,5 +1,5 @@
 DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c SHA512 bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5
 DIST apparmor-3.0.4.tar.gz 7796852 BLAKE2B 831ea65ed0972ad8a6e335e438e7b0a8a2a3977dc4360ad1923d48cc7b21b1941ec011d3894d8bdc98934b953a3f1d89a859fc27ec2530f5dd9b3cc850fe66f0 SHA512 1edd800771f46fab9bc5274842e64482b7fd4a5ba4de9855d621baf1d08c8236bfa7752dd9ab3dee095f8e0798129241a9aebf68ed1c994ae5597086a4a1a8ca
-EBUILD libapparmor-3.0.3-r1.ebuild 2129 BLAKE2B 3cc2641747dbf0f96fa6430a0d7ea3e341792a25c8b75adcb04a81e022f9746a33cdbbb7035568ced8356c9a3c07f7347328714bb03d63cfb752865b25415265 SHA512 66e961cf404dbd7562956051e70ff39863975b006fe3359a9b4a70e7ce66309d59a5ab49538c43e7c84c425743150ce4faed203999bd02800e136492dae05f18
+EBUILD libapparmor-3.0.3-r1.ebuild 2128 BLAKE2B 129a951f9349f312bc2a3e4c4bb6dd79e71f4ff7c044bd3cc680c40f91283017fe789c9c03706bcbfc6475bb17ba8c526a2258adb8155ca2642f99776394af15 SHA512 cb3b608a0478ded301f2146dbd2dd74357bfdf5f09cf5a68c152e4369e68c3bd8372377f92d6072fe1a82e1efd80497f46a413e3da2776dc1f55d4a8a2614929
 EBUILD libapparmor-3.0.4.ebuild 2389 BLAKE2B c1c673d3320531a840f8f148bdb051d39260fdfb2028eaf496a8c3d454eff2b33e78cacee7597845c2523f83052463edd6f888ed22ab86fb04afb0609dd50416 SHA512 c03e441a8ec97a24d3dc9bfda0310f1df063d9313b776a6631843efcd146676d5a55479b7635898b62151b0699f2b16ca93ffe23b26f9082307bf21c15afa7d8
 MISC metadata.xml 442 BLAKE2B f38f58b9dd0a309fcdcc3777cc497167fc8c6e313e78b148673b112c9408f8842d1d63891737ec5fb8754720d03c54336733a94aa429a4238900f02144cf732d SHA512 8e3c31f63edbdda6f04ebd7358fac18ae8d1a739af83b1a6aadec7c13f1649646c273d7bbfacce6a1d8920a165797cb48431a108481750680491c24126e404ef
diff --git a/sys-libs/libapparmor/libapparmor-3.0.3-r1.ebuild b/sys-libs/libapparmor/libapparmor-3.0.3-r1.ebuild
index f039ed3fe314..962548b771e4 100644
--- a/sys-libs/libapparmor/libapparmor-3.0.3-r1.ebuild
+++ b/sys-libs/libapparmor/libapparmor-3.0.3-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~x86"
 IUSE="doc +perl +python static-libs"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"