diff options
| author | msaitoh <msaitoh@pkgsrc.org> | 2021-03-20 06:44:11 +0000 |
|---|---|---|
| committer | msaitoh <msaitoh@pkgsrc.org> | 2021-03-20 06:44:11 +0000 |
| commit | 34489dabfc58d12ac1110aaade7f31ea415d9828 (patch) | |
| tree | eba9c4530d35351f032a6e7daaac3bfbafc5db46 | |
| parent | cd28b6f42cbdce467f30febda8ddf113dd4de4b5 (diff) | |
| download | pkgsrc-34489dabfc58d12ac1110aaade7f31ea415d9828.tar.gz | |
Add two officially recommended patches to sysutils/dmidecode.
- Fix the condition error in ascii_filter
The normal printable ASCII range is 32 to 127 (not included),
so fix the error in this if condition.
- Fix crash with -u option
A segmentation fault was reported with option -u. Turns out to be a
stupid thinko where the buffer offset was reset at the wrong loop
depth.
| -rw-r--r-- | sysutils/dmidecode/Makefile | 11 | ||||
| -rw-r--r-- | sysutils/dmidecode/distinfo | 18 |
2 files changed, 22 insertions, 7 deletions
diff --git a/sysutils/dmidecode/Makefile b/sysutils/dmidecode/Makefile index 5f553703008..fcf88a6bbda 100644 --- a/sysutils/dmidecode/Makefile +++ b/sysutils/dmidecode/Makefile @@ -1,16 +1,23 @@ -# $NetBSD: Makefile,v 1.33 2020/11/24 05:31:51 msaitoh Exp $ +# $NetBSD: Makefile,v 1.34 2021/03/20 06:44:11 msaitoh Exp $ # DISTNAME= dmidecode-3.3 +PKGREVISION= 1 EXTRACT_SUFX= .tar.xz CATEGORIES= sysutils -MASTER_SITES= http://download.savannah.gnu.org/releases/dmidecode/ +MASTER_SITES= https://download.savannah.gnu.org/releases/dmidecode/ MAINTAINER= msaitoh@NetBSD.org HOMEPAGE= https://www.nongnu.org/dmidecode/ COMMENT= Print out DMI (SMBIOS) table in human-readable format LICENSE= gnu-gpl-v2 +PATCH_SITES= https://git.savannah.gnu.org/cgit/dmidecode.git/patch/?id= +DIST_SUBDIR= dmidecode-patches +PATCHFILES= 1117390ccd9cea139638db6f460bb6de70e28f94 +PATCHFILES+= 11e134e54d15e67a64c39a623f492a28df922517 +PATCH_DIST_STRIP= -p1 + MAKE_FLAGS+= CFLAGS=${CFLAGS:Q} MAKE_FLAGS+= LDFLAGS=${LDFLAGS:Q} diff --git a/sysutils/dmidecode/distinfo b/sysutils/dmidecode/distinfo index 3afa66d7df5..06310b15cad 100644 --- a/sysutils/dmidecode/distinfo +++ b/sysutils/dmidecode/distinfo @@ -1,8 +1,16 @@ -$NetBSD: distinfo,v 1.28 2020/11/24 05:31:51 msaitoh Exp $ +$NetBSD: distinfo,v 1.29 2021/03/20 06:44:11 msaitoh Exp $ -SHA1 (dmidecode-3.3.tar.xz) = 99b8a9deaf0a003083a5a5fadcb8c016e4ebdaa4 -RMD160 (dmidecode-3.3.tar.xz) = 0d4eb5f48c1cd3f4fdf8fc82855cde8e8f94d422 -SHA512 (dmidecode-3.3.tar.xz) = dc77f40a7898011cea1b747d4677be2fbe8f52ec6ac460a5656de2f3389eca83bc416d6494acbe759971b5afce37b78f21ab55c34d62b1105b800e31566d1d22 -Size (dmidecode-3.3.tar.xz) = 56372 bytes +SHA1 (dmidecode-patches/1117390ccd9cea139638db6f460bb6de70e28f94) = 66c67e17ed52317efadab0145b101fbd4341bab0 +RMD160 (dmidecode-patches/1117390ccd9cea139638db6f460bb6de70e28f94) = ffa630e97aa930aefe852ee767d6b079eb810952 +SHA512 (dmidecode-patches/1117390ccd9cea139638db6f460bb6de70e28f94) = c99b623e84419c0cfd996fea032045685b398cb553d098725680ef93b8b56f397bd608a06484ed1b0e4cee45679710101bc9ef156ca6dacaa1dae78606935ae0 +Size (dmidecode-patches/1117390ccd9cea139638db6f460bb6de70e28f94) = 830 bytes +SHA1 (dmidecode-patches/11e134e54d15e67a64c39a623f492a28df922517) = d8500fb7bc690adda6060f77f617073193d5e0a1 +RMD160 (dmidecode-patches/11e134e54d15e67a64c39a623f492a28df922517) = af28d31066437e7e0824b3ff3252559c4a889634 +SHA512 (dmidecode-patches/11e134e54d15e67a64c39a623f492a28df922517) = 47fbe3256bd1c468ddcd34604e81b05087e1dd109c61dfdd6762d7e3d1e1bcf97ec18a7141b90a06bbe08f2f2d5a48ef243900cf0312eeb68c1cad777e83d26c +Size (dmidecode-patches/11e134e54d15e67a64c39a623f492a28df922517) = 1024 bytes +SHA1 (dmidecode-patches/dmidecode-3.3.tar.xz) = 99b8a9deaf0a003083a5a5fadcb8c016e4ebdaa4 +RMD160 (dmidecode-patches/dmidecode-3.3.tar.xz) = 0d4eb5f48c1cd3f4fdf8fc82855cde8e8f94d422 +SHA512 (dmidecode-patches/dmidecode-3.3.tar.xz) = dc77f40a7898011cea1b747d4677be2fbe8f52ec6ac460a5656de2f3389eca83bc416d6494acbe759971b5afce37b78f21ab55c34d62b1105b800e31566d1d22 +Size (dmidecode-patches/dmidecode-3.3.tar.xz) = 56372 bytes SHA1 (patch-aa) = 4ffeddeb647d07d8d712bab9983c1530e59e6f37 SHA1 (patch-dmidecode.c) = 2d7cbafd979aa7f6a33939eb136dc06e945f4188 |