[gentoo-commits] repo/gentoo:master commit in: sys-apps/ipmitool/files/, sys-apps/ipmitool/

2022-12-14 Thread Sam James
commit: e46c48504713d5f5b3ce6629551721ab773b4b44
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 15 04:53:04 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 15 04:53:04 2022 +
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  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..
--- 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..
--- 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
-#   selPoll 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..
--- 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 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/ipmitool/files/, sys-apps/ipmitool/

2022-08-17 Thread Matt Turner
commit: 72e20101b43d0bb3d5ff945401aef50fc4c39e41
Author: Matt Turner  gentoo  org>
AuthorDate: Wed Aug 17 13:49:47 2022 +
Commit: Matt Turner  gentoo  org>
CommitDate: Wed Aug 17 16:21:07 2022 +
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..
--- 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
-#   selPoll 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..
--- 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..
--- 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
-  

[gentoo-commits] repo/gentoo:master commit in: sys-apps/ipmitool/files/, sys-apps/ipmitool/

2020-08-19 Thread Patrick McLean
commit: 27c39af013c9ba5db43cd7f37eabb69b7d076873
Author: Patrick McLean  sony  com>
AuthorDate: Wed Aug 19 21:28:19 2020 +
Commit: Patrick McLean  gentoo  org>
CommitDate: Wed Aug 19 21:28:35 2020 +
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  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 000..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 
+ #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() {