feat: update dmidecode to 3.6-2

.github/workflows/call-chatOps.yml

@@ -6,5 +6,4 @@ on:
 jobs:
   chatopt:
     uses: deepin-community/.github/.github/workflows/chatOps.yml@master
-    secrets:
-      APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
+    secrets: inherit

Makefile

@@ -36,6 +36,7 @@ sbindir = $(prefix)/sbin
 mandir  = $(prefix)/share/man
 man8dir = $(mandir)/man8
 docdir  = $(prefix)/share/doc/dmidecode
+compdir = $(shell pkg-config --variable=completionsdir bash-completion 2>/dev/null || echo $(prefix)/etc/bash_completion.d)
 
 INSTALL         := install
 INSTALL_DATA    := $(INSTALL) -m 644
@@ -113,9 +114,9 @@ util.o : util.c types.h util.h config.h
 strip : $(PROGRAMS)
 	strip $(PROGRAMS)
 
-install : install-bin install-man install-doc
+install : install-bin install-man install-doc install-completion
 
-uninstall : uninstall-bin uninstall-man uninstall-doc
+uninstall : uninstall-bin uninstall-man uninstall-doc uninstall-completion
 
 install-bin : $(PROGRAMS)
 	$(INSTALL_DIR) $(DESTDIR)$(sbindir)
@@ -144,5 +145,18 @@ install-doc :
 uninstall-doc :
 	$(RM) -r $(DESTDIR)$(docdir)
 
+install-completion :
+	if [ -d $(compdir) ] ; then \
+	$(INSTALL_DIR) $(DESTDIR)$(compdir) ; \
+	for program in $(PROGRAMS) ; do \
+	$(INSTALL_DATA) completion/$$program.bash $(DESTDIR)$(compdir)/$$program ; done ; \
+	fi
+
+uninstall-completion :
+	if [ -d $(DESTDIR)$(compdir) ]; then \
+	for program in $(PROGRAMS) ; do \
+	$(RM) $(DESTDIR)$(compdir)/$$program ; done ; \
+	fi
+
 clean :
 	$(RM) *.o $(PROGRAMS) core

NEWS

@@ -1,3 +1,22 @@
+Version 3.6 (Wed Apr 24 2024)
+  - [PORTABILITY] Use -DALIGNMENT_WORKAROUND on arm.
+  - [PORTABILITY] Read SMBIOS entry point via kenv on DragonFly BSD.
+  - Support for SMBIOS 3.6.0. This includes new memory device types, new
+    processor upgrades, and Loongarch support.
+  - Support for SMBIOS 3.7.0. This includes new port types, new processor
+    upgrades, new slot characteristics and new fields for memory modules.
+  - Add bash completion.
+  - Decode HPE OEM records 197, 239 and 245.
+  - Implement options --list-strings and --list-types.
+  - Update HPE OEM records 203, 212, 216, 221, 233, 236, 237, 238 and 242.
+  - Update Redfish support.
+  - Bug fixes:
+    Fix option --from-dump for user root
+    Fix enabled slot characteristics not being printed
+  - Minor improvements:
+    Print slot width on its own line
+    Use standard strings for slot width
+
 Version 3.5 (Tue Mar 14 2023)
   - Decode HPE OEM records 216, 224, 230, 238 and 242.
   - Fortify entry point length checks.

completion/biosdecode.bash

@@ -0,0 +1,40 @@
+# bash completion for biosdecode                           -*- shell-script -*-
+
+_comp_cmd_biosdecode() {
+	local cur prev
+	COMPREPLY=()
+	cur=${COMP_WORDS[COMP_CWORD]}
+	prev=${COMP_WORDS[COMP_CWORD - 1]}
+
+	case $prev in
+	-d | --dev-mem)
+		: "${cur:=/dev/}"
+		local IFS=$'\n'
+		compopt -o filenames
+		COMPREPLY=($(compgen -f -- "$cur"))
+		return 0
+		;;
+	--pir)
+		COMPREPLY=($(compgen -W '
+			full
+		' -- "$cur"))
+		return 0
+		;;
+	-[hV] | --help | --version)
+		return 0
+		;;
+	esac
+
+	if [[ $cur == -* ]]; then
+		COMPREPLY=($(compgen -W '
+			--dev-mem
+			--pir
+			--help
+			--version
+		' -- "$cur"))
+		return 0
+	fi
+
+} && complete -F _comp_cmd_biosdecode biosdecode
+
+# ex: filetype=sh

completion/dmidecode.bash

@@ -0,0 +1,60 @@
+# bash completion for dmidecode                            -*- shell-script -*-
+
+_comp_cmd_dmidecode() {
+	local cur prev
+	COMPREPLY=()
+	cur=${COMP_WORDS[COMP_CWORD]}
+	prev=${COMP_WORDS[COMP_CWORD - 1]}
+
+	case $prev in
+	-d | --dev-mem | --dump-bin | --from-dump)
+		if [[ $prev == -d || $prev == --dev-mem ]]; then
+			: "${cur:=/dev/}"
+		fi
+		local IFS=$'\n'
+		compopt -o filenames
+		COMPREPLY=($(compgen -f -- "$cur"))
+		return 0
+		;;
+	-s | --string)
+		COMPREPLY=($(compgen -W '$("$1" --list-strings)' -- "$cur"))
+		return 0
+		;;
+	-t | --type)
+		COMPREPLY=($(compgen -W '$("$1" --list-types)' -- "$cur"))
+		return 0
+		;;
+	--dump-bin | --from-dump)
+		local IFS=$'\n'
+		compopt -o filenames
+		COMPREPLY=($(compgen -f -- "$cur"))
+		return 0
+		;;
+	-[hVH] | --help | --version | --handle | --oem-string)
+		return 0
+		;;
+	esac
+
+	if [[ $cur == -* ]]; then
+		COMPREPLY=($(compgen -W '
+			--dev-mem
+			--help
+			--quiet
+			--string
+			--list-strings
+			--type
+			--list-types
+			--handle
+			--dump
+			--dump-bin
+			--from-dump
+			--no-sysfs
+			--oem-string
+			--version
+		' -- "$cur"))
+		return 0
+	fi
+
+} && complete -F _comp_cmd_dmidecode dmidecode
+
+# ex: filetype=sh

completion/ownership.bash

@@ -0,0 +1,33 @@
+# bash completion for ownership                            -*- shell-script -*-
+
+_comp_cmd_ownership() {
+	local cur prev
+	COMPREPLY=()
+	cur=${COMP_WORDS[COMP_CWORD]}
+	prev=${COMP_WORDS[COMP_CWORD - 1]}
+
+	case $prev in
+	-d | --dev-mem)
+		: "${cur:=/dev/}"
+		local IFS=$'\n'
+		compopt -o filenames
+		COMPREPLY=($(compgen -f -- "$cur"))
+		return 0
+		;;
+	-[hV] | --help | --version)
+		return 0
+		;;
+	esac
+
+	if [[ $cur == -* ]]; then
+		COMPREPLY=($(compgen -W '
+			--dev-mem
+			--help
+			--version
+		' -- "$cur"))
+		return 0
+	fi
+
+} && complete -F _comp_cmd_ownership ownership
+
+# ex: filetype=sh

completion/vpddecode.bash

@@ -0,0 +1,43 @@
+# bash completion for vpddecode                            -*- shell-script -*-
+
+_comp_cmd_vpddecode() {
+	local cur prev
+	COMPREPLY=()
+	cur=${COMP_WORDS[COMP_CWORD]}
+	prev=${COMP_WORDS[COMP_CWORD - 1]}
+
+	case $prev in
+	-d | --dev-mem)
+		: "${cur:=/dev/}"
+		local IFS=$'\n'
+		compopt -o filenames
+		COMPREPLY=($(compgen -f -- "$cur"))
+		return 0
+		;;
+	-s | --string)
+		COMPREPLY=($(compgen -W '$(
+			"$1" --string 2>&1 | while IFS=\$'\\n' read -r line ; do
+				[[ $line == "  "* ]] && printf "%s\n" "$line"
+			done
+		' -- "$cur"))
+		return 0
+		;;
+	-[hV] | --help | --version)
+		return 0
+		;;
+	esac
+
+	if [[ $cur == -* ]]; then
+		COMPREPLY=($(compgen -W '
+			--dev-mem
+			--help
+			--string
+			--dump
+			--version
+		' -- "$cur"))
+		return 0
+	fi
+
+} && complete -F _comp_cmd_vpddecode vpddecode
+
+# ex: filetype=sh

config.h

@@ -22,7 +22,7 @@
 #endif
 
 /* Use memory alignment workaround or not */
-#ifdef __ia64__
+#if defined(__ia64__) || defined(__arm__)
 #define ALIGNMENT_WORKAROUND
 #endif
 

debian/changelog

@@ -1,14 +1,34 @@
-dmidecode (3.5-3deepin2) unstable; urgency=medium
+dmidecode (3.6-2deepin1) unstable; urgency=medium
 
-  * feat: add sw64 support
+  * Add mips64el.
+  * feat: add sw64 support.
 
- -- hudeng <hudeng@deepin.org>  Thu, 29 May 2025 11:57:17 +0800
+ -- tunaichao <tunaichao@uniontech.com>  Thu, 12 Mar 2026 10:30:52 +0800
 
-dmidecode (3.5-3deepin1) unstable; urgency=medium
+dmidecode (3.6-2) unstable; urgency=medium
 
-  * Add mips64el.
+  * debian/control:
+    - Change VCS-Git from git to https.
+  * Declare compliance with Debian Policy 4.7.0 (No changes needed).
+  * New debian/patches/0600-Fix-groff-error.patch to fix groff error.
+  * Remove obsolate debian/dmidecode.lintian-overrides.
+  * debian/control:
+    - Enable udeb for riscv64 and loong64 (Closes: #1087465).
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Fri, 15 Nov 2024 18:41:58 +0100
+
+dmidecode (3.6-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #1069767).
+    - Rebase patches.
+    - Remove upstream applied patches:
+      + debian/patches/0155-use_read_file.patch
+      + debian/patches/0160-HPE_OEM_Firmware_change.patch
+  * debian/copyright:
+    - Add year 2024 to myself.
+    - Rebase to the new release.
 
- -- lichenggang <lichenggang@deepin.org>  Mon, 06 Jan 2025 09:51:17 +0800
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 30 Jun 2024 20:32:37 +0200
 
 dmidecode (3.5-3) unstable; urgency=medium
 

debian/control

@@ -3,9 +3,9 @@ Section: utils
 Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Build-Depends: debhelper-compat (= 13)
-Standards-Version: 4.6.2.0
+Standards-Version: 4.7.0
 Rules-Requires-Root: no
-Vcs-Git: git://git.jff.email/dmidecode.git
+Vcs-Git: https://git.jff.email/cgit/dmidecode.git
 Vcs-Browser: https://git.jff.email/cgit/dmidecode.git/
 Homepage: https://nongnu.org/dmidecode/
 
@@ -30,7 +30,7 @@ Description: SMBIOS/DMI table decoder
 
 Package: dmidecode-udeb
 Section: debian-installer
-Architecture: any-amd64 arm64 armhf ia64 any-i386 sw64
+Architecture: any-amd64 arm64 armhf ia64 any-i386 riscv64 loong64 sw64
 Package-Type: udeb
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: SMBIOS/DMI table decoder (udeb)

debian/copyright

@@ -4,7 +4,7 @@ Upstream-Contact: dmidecode-devel@nongnu.org
 Source: http://download.savannah.gnu.org/releases/demidecode/
 
 Files: *
-Copyright: 2002-2020 Jean Delvare <jdelvare@suse.de>
+Copyright: 2002-2024 Jean Delvare <jdelvare@suse.de>
            2002      Alan Cox <alan@redhat.com>
            2010      Anton Arapov <anton@redhat.com>
            2015      Xie XiuQi <xiexiuqi@huawei.com>
@@ -13,7 +13,7 @@ License: GPL-2+
 Files: debian/*
 Copyright: 2003-2007 Petter Reinholdtsen <pere@debian.org>
            2011-2012 Daniel Baumann <daniel.baumann@progress-technologies.net>
-           2014-2023 Jörg Frings-Fürst <debian@jff.email>
+           2014-2024 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-2+
 
 License: GPL-2+

debian/patches/0001-hurd.patch

@@ -5,7 +5,7 @@ Index: trunk/Makefile
 ===================================================================
 --- trunk.orig/Makefile
 +++ trunk/Makefile
-@@ -44,7 +44,7 @@ INSTALL_PROGRAM := $(INSTALL) -m 755
+@@ -45,7 +45,7 @@ INSTALL_PROGRAM := $(INSTALL) -m 755
  RM              := rm -f
 
  # BSD make provides $MACHINE, but GNU make doesn't

debian/patches/0600-Fix-groff-error.patch

@@ -0,0 +1,16 @@
+Description: dmidecode.8 Fix groff error
+Author: Soren Stoutner <soren@debian.org>
+Forwarded: https://savannah.nongnu.org/patch/index.php?10463
+Last-Update: 2024-07-07
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/man/dmidecode.8
+===================================================================
+--- trunk.orig/man/dmidecode.8
++++ trunk/man/dmidecode.8
+@@ -1,3 +1,5 @@
++'\" t
++.\" ** The above line should force tbl to be a preprocessor **
+ .TH DMIDECODE 8 "February 2023" "dmidecode"
+ .\"
+ .SH NAME

debian/patches/series

@@ -11,5 +11,6 @@
 #0130-use_DWORD_for_table_max_size.patch
 #0135-hide_fixup_msg.patch
 #0140-Fix_scan_entry_point.patch
-0155-use_read_file.patch
-0160-HPE_OEM_Firmware_change.patch
+#0155-use_read_file.patch
+#0160-HPE_OEM_Firmware_change.patch
+0600-Fix-groff-error.patch