* [gentoo-commits] repo/gentoo:master commit in: sys-apps/ipmitool/files/, sys-apps/ipmitool/
@ 2020-08-19 21:28 Patrick McLean
0 siblings, 0 replies; 3+ messages in thread
From: Patrick McLean @ 2020-08-19 21:28 UTC (permalink / raw
To: gentoo-commits
commit: 27c39af013c9ba5db43cd7f37eabb69b7d076873
Author: Patrick McLean <patrick.mclean <AT> sony <DOT> com>
AuthorDate: Wed Aug 19 21:28:19 2020 +0000
Commit: Patrick McLean <chutzpah <AT> gentoo <DOT> org>
CommitDate: Wed Aug 19 21:28:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27c39af0
sys-apps/ipmitool-1.8.18-r1: Fix build with gcc-10 (bug #706870)
Closes: https://bugs.gentoo.org/706870
Copyright: Sony Interactive Entertainment Inc.
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Patrick McLean <chutzpah <AT> gentoo.org>
.../files/ipmitool-1.8.18-fno-common.patch | 22 ++++++++++++++++++++++
sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild | 1 +
2 files changed, 23 insertions(+)
diff --git a/sys-apps/ipmitool/files/ipmitool-1.8.18-fno-common.patch b/sys-apps/ipmitool/files/ipmitool-1.8.18-fno-common.patch
new file mode 100644
index 00000000000..5ca554961ca
--- /dev/null
+++ b/sys-apps/ipmitool/files/ipmitool-1.8.18-fno-common.patch
@@ -0,0 +1,22 @@
+--- a/include/ipmitool/ipmi_hpmfwupg.h
++++ b/include/ipmitool/ipmi_hpmfwupg.h
+@@ -800,8 +800,6 @@
+ char descString[HPMFWUPG_DESC_STRING_LENGTH + 1];
+ }VERSIONINFO, *PVERSIONINFO;
+
+-VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
+-
+ #define TARGET_VER (0x01)
+ #define ROLLBACK_VER (0x02)
+ #define IMAGE_VER (0x04)
+--- a/lib/ipmi_hpmfwupg.c
++++ b/lib/ipmi_hpmfwupg.c
+@@ -52,6 +52,8 @@
+ # include <config.h>
+ #endif
+
++static VERSIONINFO gVersionInfo[HPMFWUPG_COMPONENT_ID_MAX];
++
+ /* From src/plugins/ipmi_intf.c: */
+ uint16_t
+ ipmi_intf_get_max_request_data_size(struct ipmi_intf * intf);
diff --git a/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild
index 9b95f9ff8ce..314005e456a 100644
--- a/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild
+++ b/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild
@@ -31,6 +31,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}"/${P}-openssl-1.1.patch
+ "${FILESDIR}/ipmitool-1.8.18-fno-common.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/ipmitool/files/, sys-apps/ipmitool/
@ 2022-08-17 16:21 Matt Turner
0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2022-08-17 16:21 UTC (permalink / raw
To: gentoo-commits
commit: 72e20101b43d0bb3d5ff945401aef50fc4c39e41
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 17 13:49:47 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 16:21:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72e20101
sys-apps/ipmitool: Drop old versions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
.../ipmitool/files/ipmitool-1.8.9-ipmievd.confd | 22 ---
.../ipmitool/files/ipmitool-1.8.9-ipmievd.initd | 24 ---
.../ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild | 145 ---------------
.../ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild | 201 ---------------------
4 files changed, 392 deletions(-)
diff --git a/sys-apps/ipmitool/files/ipmitool-1.8.9-ipmievd.confd b/sys-apps/ipmitool/files/ipmitool-1.8.9-ipmievd.confd
deleted file mode 100644
index 42b194a771b0..000000000000
--- a/sys-apps/ipmitool/files/ipmitool-1.8.9-ipmievd.confd
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# /etc/conf.d/ipmievd
-
-# Interfaces:
-# open Linux OpenIPMI Interface
-# imb Intel IMB Interface
-# bmc IPMI v2.0 BMC interface
-# lan IPMI v1.5 LAN Interface
-# lanplus IPMI v2.0 RMCP+ LAN Interface
-
-INTERFACE="open"
-
-# Commands:
-# open Use OpenIPMI for asyncronous notification of events
-# sel Poll SEL for notification of events
-
-COMMAND="open"
-
-# Options.
-
-OPTIONS=""
diff --git a/sys-apps/ipmitool/files/ipmitool-1.8.9-ipmievd.initd b/sys-apps/ipmitool/files/ipmitool-1.8.9-ipmievd.initd
deleted file mode 100644
index 256238ef5e2c..000000000000
--- a/sys-apps/ipmitool/files/ipmitool-1.8.9-ipmievd.initd
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# /etc/init.d/ipmievd
-
-depend() {
- use logger
-}
-PN="ipmievd"
-
-start() {
- /sbin/modprobe -sq ipmi_msghandler
- /sbin/modprobe -sq ipmi_devintf
- /sbin/modprobe -sq ipmi_si
- ebegin "Starting ${PN}"
- start-stop-daemon --start --pidfile /var/run/${PN}.pid0 --exec /usr/sbin/${PN} -- -I ${INTERFACE} ${OPTIONS} ${COMMAND}
- eend $?
-}
-
-stop() {
- ebegin "Stopping ${PN}"
- start-stop-daemon --stop --pidfile /var/run/${PN}.pid0
- eend $?
-}
diff --git a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild
deleted file mode 100644
index afe6d33c7255..000000000000
--- a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Utility for controlling IPMI enabled devices"
-HOMEPAGE="http://ipmitool.sf.net/"
-DEBIAN_PR="9.debian"
-DEBIAN_PV="${PV/_p*}"
-DEBIAN_P="${PN}_${DEBIAN_PV}"
-DEBIAN_PF="${DEBIAN_P}-${DEBIAN_PR}"
-COMMIT_ID=7fd7c0f2ba39e223868a8d83d81d4074f057d6fc
-if [[ -n "${COMMIT_ID}" ]]; then
- S="${WORKDIR}/${PN}-${COMMIT_ID}"
- SRC_URI="https://github.com/ipmitool/ipmitool/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-else
- SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-fi
-# https://www.iana.org/assignments/enterprise-numbers/enterprise-numbers
-# is not available with version numbers or dates!
-SRC_URI+="
- https://dev.gentoo.org/~robbat2/distfiles/ipmitool_1.8.18-9.debian-ported-gentoo.tar.xz
- https://dev.gentoo.org/~robbat2/distfiles/enterprise-numbers.2020-10-21.xz
- "
- #http://http.debian.net/debian/pool/main/i/${PN}/${DEBIAN_PF}.tar.xz
- # https://launchpad.net/ubuntu/+archive/primary/+files/${DEBIAN_PF}.tar.xz
-#IUSE="freeipmi openipmi status"
-IUSE="openbmc openipmi static"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~ia64 ppc ppc64 x86"
-LICENSE="BSD"
-
-RDEPEND="
- dev-libs/openssl:0=
- openbmc? ( sys-apps/systemd:0= )
- sys-libs/readline:0="
-DEPEND="${RDEPEND}
- openipmi? ( sys-libs/openipmi )
- virtual/os-headers"
- #freeipmi? ( sys-libs/freeipmi )
-# ipmitool CAN build against || ( sys-libs/openipmi sys-libs/freeipmi )
-# but it doesn't actually need either.
-
-PATCHES=(
- #"${FILESDIR}"/${P}-openssl-1.1.patch
-)
-
-# I hope all of this will get MUCH cleaner if upstream will just make a new
-# release! - robbat2 2020/10/21
-src_prepare() {
- default
- if [ -d "${S}"/debian ] ; then
- mv "${S}"/debian{,.package}
- ln -s "${WORKDIR}"/debian "${S}"
- eautoreconf
- # Upstream commit includes SOME of the debian changes, but not all of them
- sed -i \
- -e '/^#/d' \
- -e '/0120-openssl1.1.patch/d' \
- debian/patches/series
- for p in $(cat debian/patches/series) ; do
- echo ${p}
- if ! nonfatal eapply -p1 debian/patches/$p ; then
- echo "failed ${p}"
- fail=1
- fi
- done
- [[ $fail -eq 1 ]] && die "fail"
- fi
- pd="${WORKDIR}"/ipmitool_1.8.18-9.debian-ported-gentoo/
- PATCHES=(
- #"${pd}"/0000.0120-openssl1.1.patch
- "${pd}"/0001.0100-fix_buf_overflow.patch
- "${pd}"/0002.0500-fix_CVE-2011-4339.patch
- "${pd}"/0003.0600-manpage_longlines.patch
- #"${pd}"/0004.0110-getpass-prototype.patch
- #"${pd}"/0005.0115-typo.patch
- "${pd}"/0006.0125-nvidia-iana.patch
- "${pd}"/0007.0615-manpage_typo.patch
- #"${pd}"/0008.0130-Correct_lanplus_segment_violation.patch
- "${pd}"/0009.0005-gcc10.patch
- #"${pd}"/0010.0010-utf8.patch
- )
- for p in "${PATCHES[@]}" ; do
- eapply -p1 ${p} || die "failed ${p}"
- done
-
- eautoreconf
-
- # If this file is not present, then ipmitool will try to download it during make install!
- cp -al \
- "${WORKDIR}/enterprise-numbers.2020-10-21" \
- "${S}"/enterprise-numbers \
- || die "Could not place IANA enterprise-numbers"
-}
-
-src_configure() {
- # - LIPMI and BMC are the Solaris libs
- # - OpenIPMI is unconditionally enabled in the configure as there is compat
- # code that is used if the library itself is not available
- # FreeIPMI does build now, but is disabled until the other arches keyword it
- # `use_enable freeipmi intf-free` \
- # --enable-ipmievd is now unconditional
- WGET=/bin/true \
- CURL=/bin/true \
- econf \
- $(use_enable static) \
- --enable-ipmishell \
- --enable-intf-lan \
- --enable-intf-usb \
- $(use_enable openbmc intf-dbus) \
- --enable-intf-lanplus \
- --enable-intf-open \
- --enable-intf-serial \
- --disable-intf-bmc \
- --disable-intf-dummy \
- --disable-intf-free \
- --disable-intf-imb \
- --disable-intf-lipmi \
- --disable-internal-md5 \
- --with-kerneldir=/usr \
- --bindir=/usr/sbin
-
- # Fix linux/ipmi.h to compile properly. This is a hack since it doesn't
- # include the below file to define some things.
- echo "#include <asm/byteorder.h>" >>config.h
-}
-
-src_install() {
- emake DESTDIR="${D}" PACKAGE="${PF}" install
-
- into /usr
- dosbin contrib/bmclanconf
- rm -f "${D}"/usr/share/doc/${PF}/COPYING
- docinto contrib
- cd "${S}"/contrib
- dodoc collect_data.sh create_rrds.sh create_webpage_compact.sh create_webpage.sh README
-
- newinitd "${FILESDIR}"/${PN}-1.8.9-ipmievd.initd ipmievd
- newconfd "${FILESDIR}"/${PN}-1.8.9-ipmievd.confd ipmievd
- # TODO: init script for contrib/bmc-snmp-proxy
- # TODO: contrib/exchange-bmc-os-info
-}
diff --git a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild
deleted file mode 100644
index 8b34a72624bb..000000000000
--- a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Utility for controlling IPMI enabled devices"
-HOMEPAGE="http://ipmitool.sf.net/"
-DEBIAN_PR="9.debian"
-DEBIAN_PV="${PV/_p*}"
-DEBIAN_P="${PN}_${DEBIAN_PV}"
-DEBIAN_PF="${DEBIAN_P}-${DEBIAN_PR}"
-COMMIT_ID=7fd7c0f2ba39e223868a8d83d81d4074f057d6fc
-if [[ -n "${COMMIT_ID}" ]]; then
- S="${WORKDIR}/${PN}-${COMMIT_ID}"
- SRC_URI="https://github.com/ipmitool/ipmitool/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-else
- SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-fi
-# https://www.iana.org/assignments/enterprise-numbers/enterprise-numbers
-# is not available with version numbers or dates!
-SRC_URI+="
- https://dev.gentoo.org/~robbat2/distfiles/ipmitool_1.8.18-9.debian-ported-gentoo.tar.xz
- https://dev.gentoo.org/~robbat2/distfiles/enterprise-numbers.2020-10-21.xz
- "
- #http://http.debian.net/debian/pool/main/i/${PN}/${DEBIAN_PF}.tar.xz
- # https://launchpad.net/ubuntu/+archive/primary/+files/${DEBIAN_PF}.tar.xz
-#IUSE="freeipmi openipmi status"
-IUSE="openbmc openipmi static"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
-LICENSE="BSD"
-
-RDEPEND="
- dev-libs/openssl:0=
- openbmc? ( sys-apps/systemd:0= )
- sys-libs/readline:0="
-DEPEND="${RDEPEND}
- >=sys-devel/autoconf-2.69-r5
- openipmi? ( sys-libs/openipmi )
- virtual/os-headers"
- #freeipmi? ( sys-libs/freeipmi )
-# ipmitool CAN build against || ( sys-libs/openipmi sys-libs/freeipmi )
-# but it doesn't actually need either.
-
-PATCHES=(
- #"${FILESDIR}"/${P}-openssl-1.1.patch
-)
-
-# I hope all of this will get MUCH cleaner if upstream will just make a new
-# release! - robbat2 2020/10/21
-src_prepare() {
- default
- if [ -d "${S}"/debian ] ; then
- mv "${S}"/debian{,.package}
- ln -s "${WORKDIR}"/debian "${S}"
- eautoreconf
- # Upstream commit includes SOME of the debian changes, but not all of them
- sed -i \
- -e '/^#/d' \
- -e '/0120-openssl1.1.patch/d' \
- debian/patches/series
- for p in $(cat debian/patches/series) ; do
- echo ${p}
- if ! nonfatal eapply -p1 debian/patches/${p} ; then
- echo "failed ${p}"
- fail=1
- fi
- done
- [[ $fail -eq 1 ]] && die "fail"
- fi
- pd="${WORKDIR}"/ipmitool_1.8.18-9.debian-ported-gentoo/
- PATCHES=(
- #"${pd}"/0000.0120-openssl1.1.patch
- "${pd}"/0001.0100-fix_buf_overflow.patch
- "${pd}"/0002.0500-fix_CVE-2011-4339.patch
- "${pd}"/0003.0600-manpage_longlines.patch
- #"${pd}"/0004.0110-getpass-prototype.patch
- #"${pd}"/0005.0115-typo.patch
- "${pd}"/0006.0125-nvidia-iana.patch
- "${pd}"/0007.0615-manpage_typo.patch
- #"${pd}"/0008.0130-Correct_lanplus_segment_violation.patch
- "${pd}"/0009.0005-gcc10.patch
- #"${pd}"/0010.0010-utf8.patch
- )
- for p in "${PATCHES[@]}" ; do
- eapply -p1 ${p} || die "failed ${p}"
- done
-
- # Gentoo chooses to install ipmitool in /usr/sbin
- # Where RedHat chooses /usr/bin
- sed -i -e \
- 's,/usr/bin/ipmitool,/usr/sbin/ipmitool,g' \
- "${S}"/contrib/* \
- || die "sed bindir failed"
-
- # Consistent RUNSTATEDIR
- sed -i -e \
- 's,/var/run,/run,g' \
- "${S}/doc/ipmievd.8.in" \
- "${S}"/contrib/* \
- "${S}"/lib/helper.c \
- "${S}"/src/ipmievd.c \
- || die "sed /var/run failed"
-
- eautoreconf
-
- # If this file is not present, then ipmitool will try to download it during make install!
- cp -al \
- "${WORKDIR}/enterprise-numbers.2020-10-21" \
- "${S}"/enterprise-numbers \
- || die "Could not place IANA enterprise-numbers"
-}
-
-src_configure() {
- # - LIPMI and BMC are the Solaris libs
- # - OpenIPMI is unconditionally enabled in the configure as there is compat
- # code that is used if the library itself is not available
- # FreeIPMI does build now, but is disabled until the other arches keyword it
- # `use_enable freeipmi intf-free` \
- # --enable-ipmievd is now unconditional
-
- # for pidfiles, runstatedir not respected in all parts of code
- append-cppflags -D_PATH_VARRUN=/run/
-
- # WGET & CURL are set to avoid network interaction, we manually inject the
- # IANA enterprise-numbers file instead.
- #
- # DEFAULT_INTF=open # default to OpenIPMI, do not take external input
- WGET=/bin/true \
- CURL=/bin/true \
- DEFAULT_INTF=open \
- econf \
- $(use_enable static) \
- --enable-ipmishell \
- --enable-intf-lan \
- --enable-intf-usb \
- $(use_enable openbmc intf-dbus) \
- --enable-intf-lanplus \
- --enable-intf-open \
- --enable-intf-serial \
- --disable-intf-bmc \
- --disable-intf-dummy \
- --disable-intf-free \
- --disable-intf-imb \
- --disable-intf-lipmi \
- --disable-internal-md5 \
- --with-kerneldir=/usr \
- --bindir=/usr/sbin \
- --runstatedir=/run \
- CFLAGS="${CFLAGS}"
-
- # Fix linux/ipmi.h to compile properly. This is a hack since it doesn't
- # include the below file to define some things.
- echo "#include <asm/byteorder.h>" >>config.h
-
-}
-
-src_install() {
- emake DESTDIR="${D}" PACKAGE="${PF}" install
- rm -f "${D}"/usr/share/doc/${PF}/COPYING
- into /usr
-
- newinitd "${FILESDIR}"/${PN}-1.8.18-ipmievd.initd ipmievd
- newconfd "${FILESDIR}"/${PN}-1.8.18-ipmievd.confd ipmievd
-
- # Everything past this point is installing contrib/
- dosbin contrib/bmclanconf
-
- exeinto /usr/libexec
- doexe contrib/log_bmc.sh
- newinitd "${FILESDIR}/log_bmc-1.8.18.initd" log_bmc
-
- # contrib/exchange-bmc-os-info.init.redhat
- # contrib/exchange-bmc-os-info.service.redhat
- # contrib/exchange-bmc-os-info.sysconf
- exeinto /usr/libexec
- newexe contrib/exchange-bmc-os-info.init.redhat exchange-bmc-os-info
- insinto /etc/sysconfig
- newins contrib/exchange-bmc-os-info.sysconf exchange-bmc-os-info
- systemd_newunit contrib/exchange-bmc-os-info.service.redhat exchange-bmc-os-info.service
- newinitd "${FILESDIR}/exchange-bmc-os-info-1.8.18.initd" exchange-bmc-os-info
-
- # contrib/bmc-snmp-proxy
- # contrib/bmc-snmp-proxy.service
- # contrib/bmc-snmp-proxy.sysconf
- exeinto /usr/libexec
- doexe contrib/bmc-snmp-proxy
- insinto /etc/sysconfig
- newins contrib/bmc-snmp-proxy.sysconf bmc-snmp-proxy
- systemd_dounit contrib/bmc-snmp-proxy.service
- # TODO: initd for bmc-snmp-proxy
-
- insinto /usr/share/${PN}
- doins contrib/oem_ibm_sel_map
-
- docinto contrib
- cd "${S}"/contrib
- dodoc collect_data.sh create_rrds.sh create_webpage_compact.sh create_webpage.sh README
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/ipmitool/files/, sys-apps/ipmitool/
@ 2022-12-15 4:57 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-12-15 4:57 UTC (permalink / raw
To: gentoo-commits
commit: e46c48504713d5f5b3ce6629551721ab773b4b44
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 15 04:53:04 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 15 04:53:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e46c4850
sys-apps/ipmitool: drop 1.8.18_p20201004-r3
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/ipmitool/Manifest | 3 -
.../files/exchange-bmc-os-info-1.8.18.initd | 23 ---
.../ipmitool/files/ipmitool-1.8.18-ipmievd.confd | 27 ---
.../ipmitool/files/ipmitool-1.8.18-ipmievd.initd | 28 ---
sys-apps/ipmitool/files/log_bmc-1.8.18.initd | 25 ---
.../ipmitool/ipmitool-1.8.18_p20201004-r3.ebuild | 203 ---------------------
6 files changed, 309 deletions(-)
diff --git a/sys-apps/ipmitool/Manifest b/sys-apps/ipmitool/Manifest
index a38bac6ab786..4b714ddf3312 100644
--- a/sys-apps/ipmitool/Manifest
+++ b/sys-apps/ipmitool/Manifest
@@ -1,5 +1,2 @@
DIST enterprise-numbers-1.8.19.xz 1500100 BLAKE2B 15c21792bf46220c5908ecf4f0ddafe2fdf13a1799c054a0cb0cb647e7f489768855c4c25fba8a4408505ff0cf02d1a43408d5c4de557b1b30fe8abb477a7926 SHA512 e88cb459a9c8a3172770bcfefbec0a7ad7d65395063c8c0173fce776ea0beb7ad9f3610e636dfbd71d0af8c952c2b9bc6c25c815daa4ab281bed983cbe2ebcc4
-DIST enterprise-numbers.2020-10-21.xz 1426932 BLAKE2B bfe39ceea321ba47cd40eafa67862eb4dfd6dc29b192afb20ad0c908cd93a16b4103c5de64d042df012417c8cadc03000f2b2a00779bcc582a430603cad5f3cf SHA512 4a854a56e8ed51997c320cbfba041d43cb98b14743ef80b67e701942068d3729604abaedb617655a83ca21a7e20ea5a622ede4de317ca492cefd46da784d28f3
-DIST ipmitool-1.8.18_p20201004.tar.gz 638493 BLAKE2B 52f4ec8c82336b88640d1b91fc17af8f2fe0948a5c48c16067867dcad0852168d48bb21fdd99bde7ed957b66df888fd369c909079d1f81c861acd8c7f8dfa6f2 SHA512 8d72eef3584f4d2c86bfe43f70b5d687f3b7bbdf75b8979f7132c5c98b01baae22c336e540c197652187749fc9bb221a92e546b56e5cf2eb5650fad5094e9433
DIST ipmitool-1.8.19.tar.gz 641383 BLAKE2B e1db12bb7301cb4b551f87fbfcd405b3597a1f32c45447b2b239d9d43a2cdbe213ee5408291d50801035cc80e28078fb3a778ab28335665bc3316798c13ea1fc SHA512 2d91706e9feba4b2ce4808eca087b81b842c4292a5840830001919c06ec8babd8f8761b74bb9dcf8fbc7765f028a5b1a192a3c1b643f2adaa157fed6fb0d1ee3
-DIST ipmitool_1.8.18-9.debian-ported-gentoo.tar.xz 3208 BLAKE2B b37a127eff361039b3b810e19dd97f0c395462b658803f56f10f2dd1abbbe92743dc409ce6b83560db15621b7fa7a3c0f989100077893993df18108a082e49d2 SHA512 0f7646a2307ac98425e99dece9d3e3b23026136a97524151efdecc910fb537af41a91702782989046e44163da98610fa05792878473e228b45c16351f6015a45
diff --git a/sys-apps/ipmitool/files/exchange-bmc-os-info-1.8.18.initd b/sys-apps/ipmitool/files/exchange-bmc-os-info-1.8.18.initd
deleted file mode 100644
index 9c63983f21f3..000000000000
--- a/sys-apps/ipmitool/files/exchange-bmc-os-info-1.8.18.initd
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-# /etc/init.d/exchange-bmc-os-info
-
-name="exchange-bmc-os-info"
-description="Exchange Information between BMC and OS"
-command=/usr/libexec/exchange-bmc-os-info
-command_args=""
-: "${DEVICENUM:=0}" # which BMC
-required_files=/dev/ipmi${DEVICENUM}
-
-depend() {
- use hostname modules
- keyword -docker -lxc -prefix -systemd-nspawn
-}
-
-start() {
- "${command}" start
-}
-stop() {
- "${command}" stop
-}
diff --git a/sys-apps/ipmitool/files/ipmitool-1.8.18-ipmievd.confd b/sys-apps/ipmitool/files/ipmitool-1.8.18-ipmievd.confd
deleted file mode 100644
index b860c23c7f89..000000000000
--- a/sys-apps/ipmitool/files/ipmitool-1.8.18-ipmievd.confd
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-# /etc/conf.d/ipmievd
-
-# Interfaces:
-# open Linux OpenIPMI Interface
-# imb Intel IMB Interface
-# bmc IPMI v2.0 BMC interface
-# lan IPMI v1.5 LAN Interface
-# lanplus IPMI v2.0 RMCP+ LAN Interface
-
-INTERFACE="open"
-
-# Commands:
-# open Use OpenIPMI for asyncronous notification of events
-# sel Poll SEL for notification of events
-#
-# 'pidfile=...' will be appended!
-COMMAND="open daemon"
-
-# Options.
-
-OPTIONS=""
-
-# Device number:
-# Used to target a specific BMC on a multi-node, multi-BMC system via the open interface
-DEVICENUM=0
diff --git a/sys-apps/ipmitool/files/ipmitool-1.8.18-ipmievd.initd b/sys-apps/ipmitool/files/ipmitool-1.8.18-ipmievd.initd
deleted file mode 100644
index e8ef2c39d454..000000000000
--- a/sys-apps/ipmitool/files/ipmitool-1.8.18-ipmievd.initd
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-# /etc/init.d/ipmievd
-
-depend() {
- use logger modules
- keyword -docker -lxc -prefix -systemd-nspawn
-}
-
-# TODO: ipmievd has a mode where it could be used to monitor multiple BMCs via
-# DEVICENUM or remote systems, and it would be valid to run multiple instances.
-# That is not supported by this init script at this time.
-
-description="IPMI event daemon for sending events to syslog LOCAL4"
-
-: "${DEVICENUM:=0}"
-: "${INTERFACE:=open}"
-: "${COMMAND:=open daemon}"
-: "${OPTIONS:=}"
-
-daemon=ipmievd
-
-pidfile=/run/${daemon}.pid${DEVICENUM} # see manpage re suffix
-command=/usr/sbin/${daemon}
-cachefile=/run/${daemon}.${DEVICENUM}.sdr-cache
-command_args="-d ${DEVICENUM} -S ${cachefile} -I ${INTERFACE} ${OPTIONS} ${COMMAND} pidfile=${pidfile}"
-required_files=/dev/ipmi$DEVICENUM
diff --git a/sys-apps/ipmitool/files/log_bmc-1.8.18.initd b/sys-apps/ipmitool/files/log_bmc-1.8.18.initd
deleted file mode 100644
index 4064edf3b84d..000000000000
--- a/sys-apps/ipmitool/files/log_bmc-1.8.18.initd
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-name="log_bmc"
-description="Add SEL entries to indicate OS Boot status"
-command=/usr/libexec/log_bmc.sh
-command_args=""
-: "${DEVICENUM:=0}" # which BMC
-required_files=/dev/ipmi${DEVICENUM}
-
-depend() {
- use modules
- after ipmievd # to capture our own log event
- keyword -docker -lxc -prefix -systemd-nspawn
-}
-
-start() {
- # TODO: should this keep start so it only fires once per boot?
- "${command}" os_boot
-}
-
-stop() {
- "${command}" os_shutdown
-}
diff --git a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r3.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r3.ebuild
deleted file mode 100644
index f551622bcac4..000000000000
--- a/sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r3.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic systemd
-
-DESCRIPTION="Utility for controlling IPMI enabled devices"
-HOMEPAGE="http://ipmitool.sf.net/"
-DEBIAN_PR="9.debian"
-DEBIAN_PV="${PV/_p*}"
-DEBIAN_P="${PN}_${DEBIAN_PV}"
-DEBIAN_PF="${DEBIAN_P}-${DEBIAN_PR}"
-COMMIT_ID=7fd7c0f2ba39e223868a8d83d81d4074f057d6fc
-if [[ -n "${COMMIT_ID}" ]]; then
- S="${WORKDIR}/${PN}-${COMMIT_ID}"
- SRC_URI="https://github.com/ipmitool/ipmitool/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz"
-else
- SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-fi
-# https://www.iana.org/assignments/enterprise-numbers/enterprise-numbers
-# is not available with version numbers or dates!
-SRC_URI+="
- https://dev.gentoo.org/~robbat2/distfiles/ipmitool_1.8.18-9.debian-ported-gentoo.tar.xz
- https://dev.gentoo.org/~robbat2/distfiles/enterprise-numbers.2020-10-21.xz
- "
- #http://http.debian.net/debian/pool/main/i/${PN}/${DEBIAN_PF}.tar.xz
- # https://launchpad.net/ubuntu/+archive/primary/+files/${DEBIAN_PF}.tar.xz
-#IUSE="freeipmi openipmi status"
-IUSE="openbmc openipmi static"
-SLOT="0"
-KEYWORDS="amd64 arm64 hppa ~ia64 ppc ppc64 x86"
-LICENSE="BSD"
-
-RDEPEND="
- dev-libs/openssl:0=
- openbmc? ( sys-apps/systemd:0= )
- sys-libs/readline:0="
-DEPEND="${RDEPEND}
- >=sys-devel/autoconf-2.69-r5
- openipmi? ( sys-libs/openipmi )
- virtual/os-headers"
- #freeipmi? ( sys-libs/freeipmi )
-# ipmitool CAN build against || ( sys-libs/openipmi sys-libs/freeipmi )
-# but it doesn't actually need either.
-
-PATCHES=(
- #"${FILESDIR}"/${P}-openssl-1.1.patch
-)
-
-# I hope all of this will get MUCH cleaner if upstream will just make a new
-# release! - robbat2 2020/10/21
-src_prepare() {
- default
- if [ -d "${S}"/debian ] ; then
- mv "${S}"/debian{,.package}
- ln -s "${WORKDIR}"/debian "${S}"
- eautoreconf
- # Upstream commit includes SOME of the debian changes, but not all of them
- sed -i \
- -e '/^#/d' \
- -e '/0120-openssl1.1.patch/d' \
- debian/patches/series
- for p in $(cat debian/patches/series) ; do
- echo ${p}
- if ! nonfatal eapply -p1 debian/patches/${p} ; then
- echo "failed ${p}"
- fail=1
- fi
- done
- [[ $fail -eq 1 ]] && die "fail"
- fi
- pd="${WORKDIR}"/ipmitool_1.8.18-9.debian-ported-gentoo/
- PATCHES=(
- #"${pd}"/0000.0120-openssl1.1.patch
- "${pd}"/0001.0100-fix_buf_overflow.patch
- "${pd}"/0002.0500-fix_CVE-2011-4339.patch
- "${pd}"/0003.0600-manpage_longlines.patch
- #"${pd}"/0004.0110-getpass-prototype.patch
- #"${pd}"/0005.0115-typo.patch
- "${pd}"/0006.0125-nvidia-iana.patch
- "${pd}"/0007.0615-manpage_typo.patch
- #"${pd}"/0008.0130-Correct_lanplus_segment_violation.patch
- "${pd}"/0009.0005-gcc10.patch
- #"${pd}"/0010.0010-utf8.patch
- )
- for p in "${PATCHES[@]}" ; do
- eapply -p1 ${p} || die "failed ${p}"
- done
-
- # Gentoo chooses to install ipmitool in /usr/sbin
- # Where RedHat chooses /usr/bin
- sed -i -e \
- 's,/usr/bin/ipmitool,/usr/sbin/ipmitool,g' \
- "${S}"/contrib/* \
- || die "sed bindir failed"
-
- # Consistent RUNSTATEDIR
- sed -i -e \
- 's,/var/run,/run,g' \
- "${S}/doc/ipmievd.8.in" \
- "${S}"/contrib/* \
- "${S}"/lib/helper.c \
- "${S}"/src/ipmievd.c \
- || die "sed /var/run failed"
-
- eautoreconf
-
- # If this file is not present, then ipmitool will try to download it during make install!
- cp -al \
- "${WORKDIR}/enterprise-numbers.2020-10-21" \
- "${S}"/enterprise-numbers \
- || die "Could not place IANA enterprise-numbers"
-}
-
-src_configure() {
- # - LIPMI and BMC are the Solaris libs
- # - OpenIPMI is unconditionally enabled in the configure as there is compat
- # code that is used if the library itself is not available
- # FreeIPMI does build now, but is disabled until the other arches keyword it
- # `use_enable freeipmi intf-free` \
- # --enable-ipmievd is now unconditional
-
- # for pidfiles, runstatedir not respected in all parts of code
- append-cppflags -D_PATH_VARRUN=/run/
-
- # WGET & CURL are set to avoid network interaction, we manually inject the
- # IANA enterprise-numbers file instead.
- #
- # DEFAULT_INTF=open # default to OpenIPMI, do not take external input
- WGET=/bin/true \
- CURL=/bin/true \
- DEFAULT_INTF=open \
- econf \
- $(use_enable static) \
- --enable-ipmishell \
- --enable-intf-lan \
- --enable-intf-usb \
- $(use_enable openbmc intf-dbus) \
- --enable-intf-lanplus \
- --enable-intf-open \
- --enable-intf-serial \
- --disable-intf-bmc \
- --disable-intf-dummy \
- --disable-intf-free \
- --disable-intf-imb \
- --disable-intf-lipmi \
- --disable-internal-md5 \
- --with-kerneldir=/usr \
- --bindir=/usr/sbin \
- --runstatedir=/run \
- CFLAGS="${CFLAGS}"
-
- # Fix linux/ipmi.h to compile properly. This is a hack since it doesn't
- # include the below file to define some things.
- echo "#include <asm/byteorder.h>" >>config.h
-
-}
-
-src_install() {
- emake DESTDIR="${D}" PACKAGE="${PF}" install
- rm -f "${D}"/usr/share/doc/${PF}/COPYING
- into /usr
-
- newinitd "${FILESDIR}"/${PN}-1.8.18-ipmievd.initd ipmievd
- newconfd "${FILESDIR}"/${PN}-1.8.18-ipmievd.confd ipmievd
- # From debian, less configurable than OpenRC
- systemd_dounit "${FILESDIR}"/ipmievd.service
-
- # Everything past this point is installing contrib/
- dosbin contrib/bmclanconf
-
- exeinto /usr/libexec
- doexe contrib/log_bmc.sh
- newinitd "${FILESDIR}/log_bmc-1.8.18.initd" log_bmc
-
- # contrib/exchange-bmc-os-info.init.redhat
- # contrib/exchange-bmc-os-info.service.redhat
- # contrib/exchange-bmc-os-info.sysconf
- exeinto /usr/libexec
- newexe contrib/exchange-bmc-os-info.init.redhat exchange-bmc-os-info
- insinto /etc/sysconfig
- newins contrib/exchange-bmc-os-info.sysconf exchange-bmc-os-info
- systemd_newunit contrib/exchange-bmc-os-info.service.redhat exchange-bmc-os-info.service
- newinitd "${FILESDIR}/exchange-bmc-os-info-1.8.18.initd" exchange-bmc-os-info
-
- # contrib/bmc-snmp-proxy
- # contrib/bmc-snmp-proxy.service
- # contrib/bmc-snmp-proxy.sysconf
- exeinto /usr/libexec
- doexe contrib/bmc-snmp-proxy
- insinto /etc/sysconfig
- newins contrib/bmc-snmp-proxy.sysconf bmc-snmp-proxy
- systemd_dounit contrib/bmc-snmp-proxy.service
- # TODO: initd for bmc-snmp-proxy
-
- insinto /usr/share/${PN}
- doins contrib/oem_ibm_sel_map
-
- docinto contrib
- cd "${S}"/contrib
- dodoc collect_data.sh create_rrds.sh create_webpage_compact.sh create_webpage.sh README
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-12-15 4:57 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-08-17 16:21 [gentoo-commits] repo/gentoo:master commit in: sys-apps/ipmitool/files/, sys-apps/ipmitool/ Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2022-12-15 4:57 Sam James
2020-08-19 21:28 Patrick McLean
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox