diff --git a/.dmidecode.metadata b/.dmidecode.metadata deleted file mode 100644 index 3bc180d..0000000 --- a/.dmidecode.metadata +++ /dev/null @@ -1 +0,0 @@ -80898f5e95d905080426fdff7899d81eb4f888c2 SOURCES/dmidecode-3.5.tar.xz diff --git a/.gitignore b/.gitignore index 9e60609..e2f3cd0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dmidecode-3.5.tar.xz +dmidecode-3.6.tar.xz diff --git a/SOURCES/0001-Consistently-use-read_file-when-reading-from-a-dump-.patch b/SOURCES/0001-Consistently-use-read_file-when-reading-from-a-dump-.patch deleted file mode 100644 index e1f41bd..0000000 --- a/SOURCES/0001-Consistently-use-read_file-when-reading-from-a-dump-.patch +++ /dev/null @@ -1,64 +0,0 @@ -From c76ddda0ba0aa99a55945e3290095c2ec493c892 Mon Sep 17 00:00:00 2001 -From: Jean Delvare -Date: Wed, 26 Apr 2023 15:44:27 +0200 -Subject: [PATCH] Consistently use read_file() when reading from a dump file - -Use read_file() instead of mem_chunk() to read the entry point from a -dump file. This is faster, and consistent with how we then read the -actual DMI table from that dump file. - -This made no functional difference so far, which is why it went -unnoticed for years. But now that a file type check was added to the -mem_chunk() function, we must stop using it to read from regular -files. - -This will again allow root to use the --from-dump option. - -Signed-off-by: Jean Delvare -Tested-by: Jerry Hoemann ---- - dmidecode.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/dmidecode.c b/dmidecode.c -index 54f59c1..52ddbf1 100644 ---- a/dmidecode.c -+++ b/dmidecode.c -@@ -6025,17 +6025,25 @@ int main(int argc, char * const argv[]) - pr_comment("dmidecode %s", VERSION); - - /* Read from dump if so instructed */ -+ size = 0x20; - if (opt.flags & FLAG_FROM_DUMP) - { - if (!(opt.flags & FLAG_QUIET)) - pr_info("Reading SMBIOS/DMI data from file %s.", - opt.dumpfile); -- if ((buf = mem_chunk(0, 0x20, opt.dumpfile)) == NULL) -+ if ((buf = read_file(0, &size, opt.dumpfile)) == NULL) - { - ret = 1; - goto exit_free; - } - -+ /* Truncated entry point can't be processed */ -+ if (size < 0x20) -+ { -+ ret = 1; -+ goto done; -+ } -+ - if (memcmp(buf, "_SM3_", 5) == 0) - { - if (smbios3_decode(buf, opt.dumpfile, 0)) -@@ -6059,7 +6067,6 @@ int main(int argc, char * const argv[]) - * contain one of several types of entry points, so read enough for - * the largest one, then determine what type it contains. - */ -- size = 0x20; - if (!(opt.flags & FLAG_NO_SYSFS) - && (buf = read_file(0, &size, SYS_ENTRY_FILE)) != NULL) - { --- -2.43.0 - diff --git a/SPECS/dmidecode.spec b/dmidecode.spec similarity index 69% rename from SPECS/dmidecode.spec rename to dmidecode.spec index cdd3ab2..221a12e 100644 --- a/SPECS/dmidecode.spec +++ b/dmidecode.spec @@ -1,14 +1,11 @@ Summary: Tool to analyse BIOS DMI data Name: dmidecode -Version: 3.5 -Release: 1%{?dist} +Version: 3.6 +Release: 3%{?dist} Epoch: 1 -License: GPLv2+ -Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.xz -URL: http://www.nongnu.org/dmidecode/ - -Patch0: 0001-Consistently-use-read_file-when-reading-from-a-dump-.patch - +License: GPL-2.0-or-later +Source0: https://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.xz +URL: https://www.nongnu.org/dmidecode/ BuildRequires: gcc make ExclusiveArch: %{ix86} x86_64 ia64 aarch64 @@ -27,14 +24,13 @@ I/O ports (e.g. serial, parallel, USB). %autosetup %build -make %{?_smp_mflags} CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}" +%make_build CFLAGS="%{optflags}" LDFLAGS="%{__global_ldflags}" %install -make %{?_smp_mflags} DESTDIR=%{buildroot} prefix=%{_prefix} install-bin install-man +%make_install %{?_smp_mflags} prefix=%{_prefix} install-bin install-man %files %doc AUTHORS NEWS README -%{!?_licensedir:%global license %%doc} %license LICENSE %{_sbindir}/dmidecode %ifnarch ia64 aarch64 @@ -45,61 +41,84 @@ make %{?_smp_mflags} DESTDIR=%{buildroot} prefix=%{_prefix} install-bin install- %{_mandir}/man8/* %changelog -* Wed Dec 20 2023 Lichen Liu - 1:3.5-1 -- Rebase to upstream 3.5 +* Tue Oct 29 2024 Troy Dawson - 1:3.6-3 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 -* Thu Jun 08 2023 Lichen Liu - 1:3.3-5 -- Resolves: rhbz#2186860 +* Mon Jun 24 2024 Troy Dawson - 1:3.6-2 +- Bump release for June 2024 mass rebuild -* Wed Jan 26 2022 Coiby Xu - 1:3.3-4 -- Resolves: rhbz#2042224 +* Sat Jun 01 2024 Jonathan Wright - 1:3.6-1 +- update to 3.6 rhbz#2276863 -* Wed Jan 05 2022 Coiby Xu - 1:3.3-3 -- Resolves: rhbz#2027665 +* Wed Jan 24 2024 Fedora Release Engineering - 1:3.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild -* Tue Nov 10 2021 Coiby Xu - 1:3.3-2 -- Resolves: rhbz#1996651 +* Fri Jan 19 2024 Fedora Release Engineering - 1:3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild -* Tue Nov 9 2021 Coiby Xu - 1:3.3-1 -- Rebase to upsteam 3.3 -- Resolves: rhbz#1998772 +* Thu Aug 10 2023 Coiby Xu - 1:3.5-1 +- Update to 3.5 -* Fri Apr 9 2021 Coiby Xu - 1:3.2-10 -- Fix crash with -u option -- Resolves: rhbz#1885823 +* Thu Aug 10 2023 Coiby Xu - 1:3.4-5 +- Use SPDX identifiers for license -* Thu Dec 10 2020 Lianbo Jiang - 1:3.2-8 -- CI found an error in the commit , need to fix it. -- Resolves: rhbz#1858350 +* Wed Jul 19 2023 Fedora Release Engineering - 1:3.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild -* Tue Dec 08 2020 Lianbo Jiang - 1:3.2-7 -- Fix the "OUT OF SPEC" error for empty NVMe and DIMM slots -- Resolves: rhbz#1858350 +* Thu Jan 19 2023 Fedora Release Engineering - 1:3.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild -* Wed May 20 2020 Lianbo Jiang - 1:3.2-6 -- Updated to the latest upstream(5b3c8e995026 ("Allow overriding - build settings from the environment")) -- Resolves: rhbz#1796581 +* Thu Jul 21 2022 Fedora Release Engineering - 1:3.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild -* Sun Oct 27 2019 Lianbo Jiang - 1:3.2-5 -- Fix the "OUT OF SPEC" for type 9 -- Resolves: rhbz#1763678 +* Tue Jul 12 2022 Davide Cavalca 1:3.4-1 +- Update to 3.4; Fixes: RHBZ#2101507 -* Mon Oct 21 2019 Lianbo Jiang - 1:3.2-4 -- Updated to the latest upstream(a808e6ef4ebc ("Typo")) -- Resolves: rhbz#1725435 +* Thu Jan 20 2022 Fedora Release Engineering - 1:3.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild -* Mon Apr 22 2019 Lianbo Jiang - 1:3.2-3 -- Add "Logical non-volatile device" to the memory device types -- Resolves: rhbz#1664573 +* Wed Jul 21 2021 Fedora Release Engineering - 1:3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild -* Mon Apr 15 2019 Lianbo Jiang - 1:3.2-2 -- add CI gating test. -- Resolves: rhbz#1680617 +* Wed May 19 2021 Coiby Xu - 1:3.3-1 +- updated to upstream v3.3 +- Supported SMBIOS spec up to v3.3.0 -* Wed Sep 19 2018 Lianbo Jiang - 1:3.2-1 -- update to upstream dmidecode-3.2 -- Resolves: rhbz#1628211 +* Tue Jan 26 2021 Fedora Release Engineering - 1:3.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1:3.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 13 2020 Tom Stellard - 1:3.2-7 +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + +* Mon Feb 03 2020 Tom Stellard - 1:3.2-6 +- Use make_build macro instead of plain make + +* Tue Jan 28 2020 Fedora Release Engineering - 1:3.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Nov 18 2019 Anton Arapov - 1:3.2-4 +- v3.2 patched up to upstream commit 62bce59f + +* Wed Jul 24 2019 Fedora Release Engineering - 1:3.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jan 31 2019 Fedora Release Engineering - 1:3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Tue Sep 18 2018 Anton Arapov - 1:3.2-1 +- updated to upstream v3.2 +- Supported SMBIOS spec up to v3.2.0 + +* Thu Aug 02 2018 Anton Arapov - 1:3.1-7 +- patched up to upstream commit bd78a5dfd4 + +* Thu Jul 12 2018 Fedora Release Engineering - 1:3.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild * Wed Feb 07 2018 Fedora Release Engineering - 1:3.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources new file mode 100644 index 0000000..cb036b7 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (dmidecode-3.6.tar.xz) = b1e47a2121062581876ba2daf3ce80b1c39612d078718609b8bc97d4e7a4b47427200502468b5d71f0d0dcb5ba299fb2e808791b62dc5b50e67acac60c51a461