From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 44C2F158094 for ; Wed, 17 Aug 2022 16:21:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97153E092E; Wed, 17 Aug 2022 16:21:28 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7521BE092E for ; Wed, 17 Aug 2022 16:21:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ACE9C341389 for ; Wed, 17 Aug 2022 16:21:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 724AF5A0 for ; Wed, 17 Aug 2022 16:21:24 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1660753267.72e20101b43d0bb3d5ff945401aef50fc4c39e41.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/ipmitool/files/, sys-apps/ipmitool/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/ipmitool/files/ipmitool-1.8.9-ipmievd.confd sys-apps/ipmitool/files/ipmitool-1.8.9-ipmievd.initd sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r1.ebuild sys-apps/ipmitool/ipmitool-1.8.18_p20201004-r2.ebuild X-VCS-Directories: sys-apps/ipmitool/ sys-apps/ipmitool/files/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 72e20101b43d0bb3d5ff945401aef50fc4c39e41 X-VCS-Branch: master Date: Wed, 17 Aug 2022 16:21:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 34c5af2d-85b4-4ad3-8ad9-cc5e67d6176b X-Archives-Hash: 393d18d8b7c9c18fe3f96a3566b4a0a1 commit: 72e20101b43d0bb3d5ff945401aef50fc4c39e41 Author: Matt Turner gentoo org> AuthorDate: Wed Aug 17 13:49:47 2022 +0000 Commit: Matt Turner gentoo 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 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 " >>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 " >>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 -}