diff options
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/Manifest.gz | bin | 49147 -> 49150 bytes | |||
| -rw-r--r-- | sys-apps/dmidecode/Manifest | 2 | ||||
| -rw-r--r-- | sys-apps/dmidecode/dmidecode-3.5-r2.ebuild | 51 | ||||
| -rw-r--r-- | sys-apps/dmidecode/files/dmidecode-3.5-backport-HPE-OEM-record-137-fix.patch | 39 |
4 files changed, 92 insertions, 0 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz Binary files differindex fb53b4187a1a..868328021a33 100644 --- a/sys-apps/Manifest.gz +++ b/sys-apps/Manifest.gz diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest index 1bb610c28df8..20eb8ef9e362 100644 --- a/sys-apps/dmidecode/Manifest +++ b/sys-apps/dmidecode/Manifest @@ -1,5 +1,7 @@ +AUX dmidecode-3.5-backport-HPE-OEM-record-137-fix.patch 1667 BLAKE2B 4657a4a77b7d1236536c2a5cd7dcf5f35a09ff9e6b658069b61850320e4c7f195f394487759c00970344a0585473b9b4209c000a21965f48d166bfc8057aab69 SHA512 8a3b3634843c2ce4de35cc922a43f53164e379be4ea32f832ee465bbde7795b50c5f9e43205869f41ca7565621c178c77f9745b7c976a7b9bd53167ab160db1e DIST dmidecode-3.4.tar.xz 61420 BLAKE2B f9f0429c5128692c2d1d560580552285ea900c1c9ef6f68f0e2133ae1ef05b85a943e882f915d3ef969b7a7e3f3f6bbc4ec391e7bd3d98092976ddbf02421c49 SHA512 62990b6159e5a7c8688d37e44957e7948391d2c6afeabaa4514ba9dad2d08b020297676e2dbbfcb6471efc6fb6f3682750422931a953f78f358bb3dd3745e95b DIST dmidecode-3.5.tar.xz 65068 BLAKE2B 07cc4c069dc1cba36160de158c4d0390df9b77b4192f5847df0756f9e097a7fbc751cd7b5b073df7661267ab78ea0d9be2831d70ddda8d1981c628f3cfee8802 SHA512 690c9bea391f6bbfc8cd48e8db408a61d5b551a07a2823c29d03a09607fc2043cc1bea44ee9fd27fd0e7bc0b287bf9de9f22a1a66053f5b1e63d77c03d93e1ae EBUILD dmidecode-3.4-r1.ebuild 1267 BLAKE2B 192354d563ce61f75142258d72221286d9e0e247fc6f29326367ff387aa8e822d4adeb5997604d09b245816b4f9808e439018448ad5d0571c6678068a9d22891 SHA512 c89d56c5567f8a2ea1e58b0722159e6e484e2113faae43570e6879bb9bbfba7c376a19d98cde7501864499eb3f1cc6ad8ee09159c52145f9eb2eb3bcc2bcf233 EBUILD dmidecode-3.5-r1.ebuild 1273 BLAKE2B b17a977fe9eaf3fa63de4b984f6cd2ce679f09d201e42412c94f48c1bc99b16e5acc755cbe7b8f0bbfd96ca735a1ad8db18c919d95ce695c6432df37c4933e81 SHA512 5afd600c4585ae871fe5006bf0a7226893e714faee1ecd3e1e629d228ae4f04305b4a827ee87db60075cc5b67a779fdd83bd24642e3e460dc79f7033e9c0057c +EBUILD dmidecode-3.5-r2.ebuild 1344 BLAKE2B 751f45a9c7f7e0ade952b7cec470ec6bb2bf56235bcd3641da2b4558baf99325e9811d856f48a78920105c95c47e00023ce60019d57431ccc71739c3a2c880d4 SHA512 7abca4bf322eb0cf0cff6715dd5dc334619f8cbfda165217443b7d3a43e07f50cc4f13286e8949cd0b217f6b0344900400b8b6d952756f6cf9df2b946d9e5c70 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c diff --git a/sys-apps/dmidecode/dmidecode-3.5-r2.ebuild b/sys-apps/dmidecode/dmidecode-3.5-r2.ebuild new file mode 100644 index 000000000000..b9fa80eb0516 --- /dev/null +++ b/sys-apps/dmidecode/dmidecode-3.5-r2.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Upstream often give "recommended patches" at https://www.nongnu.org/dmidecode/ +# Check regularly after releases! +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="DMI (Desktop Management Interface) table related utilities" +HOMEPAGE="https://www.nongnu.org/dmidecode/" +SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-* ~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~x86-solaris" +IUSE="selinux" + +RDEPEND="selinux? ( sec-policy/selinux-dmidecode )" + +PATCHES=( + "${FILESDIR}"/${P}-backport-HPE-OEM-record-137-fix.patch +) + +src_prepare() { + default + + sed -i \ + -e "/^prefix/s:/usr/local:${EPREFIX}/usr:" \ + -e "/^docdir/s:dmidecode:${PF}:" \ + -e '/^PROGRAMS !=/d' \ + Makefile || die +} + +src_compile() { + append-lfs-flags + + emake \ + CFLAGS="${CFLAGS} ${CPPFLAGS}" \ + LDFLAGS="${LDFLAGS}" \ + CC="$(tc-getCC)" +} + +pkg_postinst() { + if [[ ${CHOST} == *-solaris* ]] ; then + einfo "dmidecode needs root privileges to read /dev/xsvc" + einfo "To make dmidecode useful, either run as root, or chown and setuid the binary." + einfo "Note that /usr/sbin/ptrconf and /usr/sbin/ptrdiag give similar" + einfo "information without requiring root privileges." + fi +} diff --git a/sys-apps/dmidecode/files/dmidecode-3.5-backport-HPE-OEM-record-137-fix.patch b/sys-apps/dmidecode/files/dmidecode-3.5-backport-HPE-OEM-record-137-fix.patch new file mode 100644 index 000000000000..b1c0270c4762 --- /dev/null +++ b/sys-apps/dmidecode/files/dmidecode-3.5-backport-HPE-OEM-record-137-fix.patch @@ -0,0 +1,39 @@ +As recommended by upstream on their website. + +From 80de376231e903d2cbea95e51ffea31860502159 Mon Sep 17 00:00:00 2001 +From: Jerry Hoemann <jerry.hoemann@hpe.com> +Date: Mon, 3 Apr 2023 10:15:12 +0200 +Subject: dmioem: HPE OEM Record 237 Firmware change + +HPE OEM record type 237 offset 0x09 field was changed from a single +byte STRING to a two byte WORD representing date. + +Fixes: cdab638dabb7 ("dmioem: Decode HPE OEM Record 237") +Signed-off-by: Jerry Hoemann <jerry.hoemann@hpe.com> +Signed-off-by: Jean Delvare <jdelvare@suse.de> +--- a/dmioem.c ++++ b/dmioem.c +@@ -1094,7 +1094,8 @@ static int dmi_decode_hp(const struct dmi_header *h) + * 0x06 | Manufacture|STRING | DIMM Manufacturer + * 0x07 | Part Number|STRING | DIMM Manufacturer's Part Number + * 0x08 | Serial Num |STRING | DIMM Vendor Serial Number +- * 0x09 | Spare Part |STRING | DIMM Spare Part Number ++ * 0x09 | Man Date | BYTE | DIMM Manufacture Date (YEAR) in BCD ++ * 0x0A | Man Date | BYTE | DIMM Manufacture Date (WEEK) in BCD + */ + if (gen < G9) return 0; + pr_handle_name("%s DIMM Vendor Information", company); +@@ -1105,8 +1106,9 @@ static int dmi_decode_hp(const struct dmi_header *h) + pr_attr("DIMM Manufacturer Part Number", "%s", dmi_string(h, data[0x07])); + if (h->length < 0x09) break; + pr_attr("DIMM Vendor Serial Number", "%s", dmi_string(h, data[0x08])); +- if (h->length < 0x0A) break; +- pr_attr("DIMM Spare Part Number", "%s", dmi_string(h, data[0x09])); ++ if (h->length < 0x0B) break; ++ if (WORD(data + 0x09)) ++ pr_attr("DIMM Manufacture Date", "20%02x-W%02x", data[0x09], data[0x0A]); + break; + + case 238: +-- +cgit v1.1 |