From 3cf7c3ef441822c889356fd1812ebf2944a59851 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 25 Aug 2020 10:45:55 +0100 Subject: gentoo resync : 25.08.2020 --- sys-apps/ipmitool/Manifest | 6 +- .../files/ipmitool-1.8.18-fno-common.patch | 22 ++++++ sys-apps/ipmitool/ipmitool-1.8.17-r1.ebuild | 83 ---------------------- sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild | 3 +- 4 files changed, 26 insertions(+), 88 deletions(-) create mode 100644 sys-apps/ipmitool/files/ipmitool-1.8.18-fno-common.patch delete mode 100644 sys-apps/ipmitool/ipmitool-1.8.17-r1.ebuild (limited to 'sys-apps/ipmitool') diff --git a/sys-apps/ipmitool/Manifest b/sys-apps/ipmitool/Manifest index 1714252e6e6d..ec54f2f54a2a 100644 --- a/sys-apps/ipmitool/Manifest +++ b/sys-apps/ipmitool/Manifest @@ -1,10 +1,8 @@ +AUX ipmitool-1.8.18-fno-common.patch 595 BLAKE2B 7134e86b3c5fb0381eeb1d413b72abf409b57a7f4cf7849b1e52e0c0a6b56a5f3c777186b5fbbb2df555c924974850e9af65a0a3a3a8e6e58b542318a18ab35b SHA512 4f51aab99809d3c64ed47e61c8de6b93b8a788c3cfa6e87faf17894cda85aa5b7293e1d29813dcf1335a3c5eb64dc1f8f1657ca09adb248cf3aaffe64f5d3cb5 AUX ipmitool-1.8.18-openssl-1.1.patch 3838 BLAKE2B 4664bdf8c5ec0f40389f9773043cec0821b5a6e031f7d5cd6be7cd5195f45e9bb5fff5ed9da1d01ca5b510601be8054763236f65b180891b65db8b7ffa68ff0a SHA512 361d52bb966a8dfaa3592d8ca2f0e7083030b81b1ed84667d5bb1c68671a810802e2d4e77808fa9d44e45a04f74998cc6c6ac5182a169f175adc328636073418 AUX ipmitool-1.8.9-ipmievd.confd 518 BLAKE2B 98d9a8e5de576242e81aa7dbfcfde7063b25448c5a50780d4e70410c1fba4adcca81abfcd48ea1a5cf5a55006c59678bc112bb86422571b82a0fb8c517f3292f SHA512 6253f218b22fc98768d3a26aec60da8b80229f3f4e2137cf6b34cefb465a420400e451fb07e6f3f626d88904644e4e2bddd280e01bf6d6cacd06cf6b59f20fe4 AUX ipmitool-1.8.9-ipmievd.initd 584 BLAKE2B 6632466d88006f6623ae81722b2f2726ede5b99141f794829c1cff5808bbb2851e29858beb96b40061de019be08f8179d90f8008b74221cd058a34586b3f5680 SHA512 5d42774486a0edaf1dcece16fbad0cca531a91559ba8dd4259f05787e1964fbfec4d11c9427dbe8cb46ba0cc1a447120bfa82254aac4850d9acc632834daa669 -DIST ipmitool-1.8.17.tar.gz 976189 BLAKE2B 62ca530b2a9fdc0e8071d02b7f903530f223bdf07d75278eb9dafeb167b9ec347b0fbf199e2e7cf8f258463abfc8887c8b9b4df80509758ae8588ca73bbaf68a SHA512 929cf0087d3d712caf845eb62771aa96d034c2222170850b0d8bfdbb41d0b0aee05c14aa48e82368f4494606781c6639ada348fd086907c21b817d95dd36a3f6 DIST ipmitool-1.8.18.tar.gz 995313 BLAKE2B 4aee2b1488a8a97348954dd1555baf3d576d70f22fd17f11ba6147595b07ef52059ac8ab6775afa0ad956355eefbf3e2b0300cf87bb373d2f82b585de807412d SHA512 274d424fff079f7628c0f9fe06580937cb9717c809a71b2f5ef97266c6b6c89983b662fbb1f090e2f94861f1799677c8fc6536013828a8a5e6cb239af53e45ab -DIST ipmitool_1.8.17-1.debian.tar.xz 18252 BLAKE2B 6219d81b6b54354e8e412850fc1ee673e2dead153076d55c67fad0518e7230642934a52ba0abea29d8b1f47eb7beef10cbe25a7b8a4df158d4b44b1f1e229f4d SHA512 e1133262020e8fabe47e7aa308956078bc9fb3bb7033413230f1cf76aca1d4733bac64e52039365f24fe54a1bf8e271071bdaa1722720fca62f1c9e8888777a8 DIST ipmitool_1.8.18-1.debian.tar.xz 19140 BLAKE2B 255c4da005946f3b118a127f96fc5daad02a170ea079d7a765a0c7650e1eb7e50ad49b31fca95312b49e5a524e04a8a21215cafb1a8451e5b2af2aaec22cda75 SHA512 8aede337d07987decfd032898f194d32730eced443630ac3956676533d693fb2d17a175ef14218cbcd55da44f6b17714f676a912a1d5124a15a995e01d2828ef -EBUILD ipmitool-1.8.17-r1.ebuild 2443 BLAKE2B 4204805a6f363de5f658168821d8293b20ec61f68447c31c3448c28701e6246bc0cff63a78acbe655bb0ae529a637dda89b917b2f9a949ed43630f248990c97c SHA512 8824e25c00e9b9406fddec2caa638fabbcc1a1d8207a7784e2b6bf7d8c59bc6a668edeaf199a3a347d4be2e046b4efc5ab5198c242fdf9395ee825d6e2df8f2d -EBUILD ipmitool-1.8.18-r1.ebuild 2569 BLAKE2B f72611c58ca80d27154b4ea8089538e31f4a86019409ee437da202fbc99e87b32194a48cd7340da49167b3d018a7bdf4ed568f4fb4cc45fa878081da3aa738d3 SHA512 d954614117f756f65553c51791a9a152129782142a61b846b213fff619fdb6ce75338a09a5a33eabb8b10da719253809be7dacc21a105e0d0daca8a38947e282 +EBUILD ipmitool-1.8.18-r1.ebuild 2624 BLAKE2B 9baa3c566fe553602f3c5e53e165d1fa6a0adc93943cbb61a292e8ca5d6993b9f4f343105faebd126b8bc2808af0c9ac76b6ed992798908b68374f7b9fc767f4 SHA512 2b6f7dc4f51ba3a523a929481f4e6e72cc444687385a7588bcd59e22f39ba63ef79b9a33e39e96d8b89f129bc91a40a55673f9346e6cbeb0724da3c7eb6ea63c MISC metadata.xml 570 BLAKE2B 2211290e4ac3a12d1a05528925d3c69534073c2624023244ed263aa312de28e5cfd76ff284870777508fd6818fcde18f9d740f9499cc5819078aaa84f46fd07a SHA512 16820cee9cff78b0137cbfcd179cdf78a503c583e8ca3e2ebf13094e21419770eb94205371b61c74c2e75f351d95ed74e6eaf060d748554c6602552ffa9151b8 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 000000000000..5ca554961ca6 --- /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.17-r1.ebuild b/sys-apps/ipmitool/ipmitool-1.8.17-r1.ebuild deleted file mode 100644 index 0e6967bb3a2c..000000000000 --- a/sys-apps/ipmitool/ipmitool-1.8.17-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit autotools eutils - -DESCRIPTION="Utility for controlling IPMI enabled devices." -HOMEPAGE="http://ipmitool.sf.net/" -DEBIAN_PR="1.debian" -DEBIAN_P="${P/-/_}" -DEBIAN_PF="${DEBIAN_P}-${DEBIAN_PR}" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz - https://launchpad.net/ubuntu/+archive/primary/+files/${DEBIAN_PF}.tar.xz" -#IUSE="freeipmi openipmi status" -IUSE="libressl openipmi static" -SLOT="0" -KEYWORDS="amd64 hppa ~ia64 ppc x86" -LICENSE="BSD" - -RDEPEND=" - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl: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. - -src_prepare() { - default - [ -d "${S}"/debian ] && mv "${S}"/debian{,.package} - ln -s "${WORKDIR}"/debian "${S}" - for p in $(grep -v "^#" debian/patches/series) ; do - eapply debian/patches/$p - done - - eautoreconf -} - -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 - econf \ - $(use_enable static) \ - --enable-ipmishell \ - --enable-intf-lan \ - --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-r1.ebuild b/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild index 3838cd1bd338..314005e456a4 100644 --- a/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild +++ b/sys-apps/ipmitool/ipmitool-1.8.18-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz #IUSE="freeipmi openipmi status" IUSE="libressl openipmi static" SLOT="0" -KEYWORDS="amd64 hppa ~ia64 ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm64 hppa ~ia64 ppc ~ppc64 x86" LICENSE="BSD" RDEPEND=" @@ -31,6 +31,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}"/${P}-openssl-1.1.patch + "${FILESDIR}/ipmitool-1.8.18-fno-common.patch" ) src_prepare() { -- cgit v1.2.3