Update decode-dimms to 2020-09-07

From upstream commit logs: * Add a BUGS section to the man page * Update the list of vendors to Jedec JEP106BB
author: pgoyette <pgoyette@pkgsrc.org> 2020-09-07 14:50:25 +0000
committer: pgoyette <pgoyette@pkgsrc.org> 2020-09-07 14:50:25 +0000
commit: 98457b23ad0b12ab65bf09df896a195352c06677 (patch)
tree: 08dc26926dedafc941bf082b0c635d801a26e09c
parent: 50fcb18d98e7c814d020247048af98fc40542e05 (diff)
download: pkgsrc-98457b23ad0b12ab65bf09df896a195352c06677.tar.gz
4 files changed, 30 insertions, 28 deletions
diff --git a/sysutils/decode-dimms/Makefile b/sysutils/decode-dimms/Makefile
index d3563b38247..56e5466f4c4 100644
--- a/sysutils/decode-dimms/Makefile
+++ b/sysutils/decode-dimms/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.27 2020/08/31 18:11:27 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2020/09/07 14:50:25 pgoyette Exp $
 
 # Track upstream's HEAD
-PKG_DATE=	20191031
-PKGREVISION=	3
-GIT_COMMIT=	fde115730417ff24025f6f0f54d879f6b0789aca
+PKG_DATE=	20200907
+GIT_COMMIT=	349b18f5660548f8aaae4014a8fbb1a3e71d89c2
 DISTNAME=	i2c-tools-${GIT_COMMIT}
 PKGNAME=	decode-dimms-4.1.${PKG_DATE}
 CATEGORIES=	sysutils
diff --git a/sysutils/decode-dimms/distinfo b/sysutils/decode-dimms/distinfo
index 64e7a9b70b4..93aea838553 100644
--- a/sysutils/decode-dimms/distinfo
+++ b/sysutils/decode-dimms/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.19 2019/10/31 18:33:40 pgoyette Exp $
+$NetBSD: distinfo,v 1.20 2020/09/07 14:50:25 pgoyette Exp $
 
-SHA1 (i2c-tools-fde115730417ff24025f6f0f54d879f6b0789aca.tar.gz) = 9f218c6239a20be444ec7b4f5abe6459551de567
-RMD160 (i2c-tools-fde115730417ff24025f6f0f54d879f6b0789aca.tar.gz) = 5872fabd73f32c793679dcf1d23ed7cb74da8a7c
-SHA512 (i2c-tools-fde115730417ff24025f6f0f54d879f6b0789aca.tar.gz) = b51107b09578409d729a0d4dd2b3272ed8a4b46fa32faeda803e3c2e5c7874bdf405fc32e445d4d8a5f6f3fdd61256817d83aa744d246198935fd5cb7f5dd80e
-Size (i2c-tools-fde115730417ff24025f6f0f54d879f6b0789aca.tar.gz) = 98669 bytes
-SHA1 (patch-decode-dimms) = c8c860c82665eb2d535a7ce6b5a663f7a77da251
-SHA1 (patch-decode-dimms.1) = 2e0991d98f4fed6c1b4caa9bbf775b4b49c3cbe0
+SHA1 (i2c-tools-349b18f5660548f8aaae4014a8fbb1a3e71d89c2.tar.gz) = 94b8b1dbf98e470bd918f88ede17b687b51b2ef4
+RMD160 (i2c-tools-349b18f5660548f8aaae4014a8fbb1a3e71d89c2.tar.gz) = e40d4e4a5c47f30a8f5f3cf99df9ffd558e1362f
+SHA512 (i2c-tools-349b18f5660548f8aaae4014a8fbb1a3e71d89c2.tar.gz) = dc2c766e8587580882c8fb945fdf267753e2653cd3f6c8e32b51eb87d73b3c463d78f0a1f607161c8749031a91a1e8b5bcace57a97c181772fb55eea5d01c531
+Size (i2c-tools-349b18f5660548f8aaae4014a8fbb1a3e71d89c2.tar.gz) = 101130 bytes
+SHA1 (patch-decode-dimms) = 8f8f03cb1bae03a5572bb65f88dfce216f98549f
+SHA1 (patch-decode-dimms.1) = fc221f7fbff2580d1e49026c2dca3872c5fd8de7
diff --git a/sysutils/decode-dimms/patches/patch-decode-dimms b/sysutils/decode-dimms/patches/patch-decode-dimms
index d6deec187d8..41fae73bdfb 100644
--- a/sysutils/decode-dimms/patches/patch-decode-dimms
+++ b/sysutils/decode-dimms/patches/patch-decode-dimms
@@ -1,10 +1,10 @@
-$NetBSD: patch-decode-dimms,v 1.17 2019/10/08 17:11:45 pgoyette Exp $
+$NetBSD: patch-decode-dimms,v 1.18 2020/09/07 14:50:25 pgoyette Exp $
 
 Add NetBSD-specific ability to use spdmem(4)'s sysctl values as
 input.  Remove attempts to use linux-specific data sources.
 
---- eeprom/decode-dimms.orig	2019-10-08 10:01:39.370148879 -0700
-+++ eeprom/decode-dimms	2019-10-08 09:57:14.231699228 -0700
+--- eeprom/decode-dimms.orig	2020-09-07 07:41:27.782730720 -0700
++++ eeprom/decode-dimms	2020-09-07 07:42:58.255264706 -0700
 @@ -45,8 +45,9 @@
  use Fcntl qw(:DEFAULT :seek);
  use File::Basename;
@@ -17,16 +17,16 @@ input.  Remove attempts to use linux-specific data sources.
  
  use constant LITTLEENDIAN	=> "little-endian";
  use constant BIGENDIAN		=> "big-endian";
-@@ -418,7 +419,7 @@
-  "Thermaltake Technology Co Ltd", "Shenzhen O'Yang Maile Technology Ltd", "UPMEM"]
- );
+@@ -497,7 +498,7 @@
+ 	die "Unexpected number of vendor names in page $page" unless @{$vendors[$page]} == 126;
+ }
  
 -$use_sysfs = -d '/sys/bus';
 +$use_sysctl = 0;
  
  # We consider that no data was written to this area of the SPD EEPROM if
  # all bytes read 0x00 or all bytes read 0xff
-@@ -2357,6 +2358,26 @@
+@@ -2436,6 +2437,26 @@
  	}
  }
  
@@ -53,7 +53,7 @@ input.  Remove attempts to use linux-specific data sources.
  # Read bytes from SPD-EEPROM
  # Note: offset must be a multiple of 16!
  sub readspd($$$)
-@@ -2370,20 +2391,13 @@
+@@ -2449,20 +2470,13 @@
  			$size = @bytes - $offset;
  		}
  		return @bytes[$offset..($offset + $size - 1)];
@@ -80,7 +80,7 @@ input.  Remove attempts to use linux-specific data sources.
  	} else {
  		# Kernel 2.4 with procfs
  		for my $i (0 .. ($size-1)/16) {
-@@ -2449,7 +2463,7 @@
+@@ -2528,7 +2542,7 @@
  # Parse command-line
  foreach (@ARGV) {
  	if ($_ eq '-h' || $_ eq '--help') {
@@ -89,7 +89,7 @@ input.  Remove attempts to use linux-specific data sources.
  			"       $0 -h\n\n",
  			"  -f, --format            Print nice html output\n",
  			"  -b, --bodyonly          Don't print html header\n",
-@@ -2463,6 +2477,8 @@
+@@ -2542,6 +2556,8 @@
  			"  -x,                     Read data from hexdump files\n",
  			"  -X,                     Same as -x except treat multibyte hex\n",
  			"                          data as little endian\n",
@@ -98,7 +98,7 @@ input.  Remove attempts to use linux-specific data sources.
  			"  -h, --help              Display this usage summary\n";
  		print <<"EOF";
  
-@@ -2507,85 +2523,25 @@
+@@ -2586,85 +2602,25 @@
  		$use_hexdump = LITTLEENDIAN;
  		next;
  	}
@@ -192,7 +192,7 @@ input.  Remove attempts to use linux-specific data sources.
  # @dimm is a list of hashes. There's one hash for each EEPROM we found.
  # Each hash has the following keys:
  #  * eeprom: Name of the eeprom data file
-@@ -2598,7 +2554,6 @@
+@@ -2677,7 +2633,6 @@
  #  * chk_spd: The checksum or CRC value found in the EEPROM
  #  * chk_calc: The checksum or CRC computed from the EEPROM data
  # Keys are added over time.
@@ -200,7 +200,7 @@ input.  Remove attempts to use linux-specific data sources.
  
  for my $i (0 .. $#dimm) {
  	my @bytes = readspd(0, 128, $dimm[$i]->{file});
-@@ -2650,7 +2605,7 @@
+@@ -2729,7 +2684,7 @@
  		printl("Decoding EEPROM", $dimm[$current]->{eeprom});
  	}
  
diff --git a/sysutils/decode-dimms/patches/patch-decode-dimms.1 b/sysutils/decode-dimms/patches/patch-decode-dimms.1
index 1ed33683042..acc494bb999 100644
--- a/sysutils/decode-dimms/patches/patch-decode-dimms.1
+++ b/sysutils/decode-dimms/patches/patch-decode-dimms.1
@@ -1,9 +1,9 @@
-$NetBSD: patch-decode-dimms.1,v 1.2 2019/10/31 18:33:40 pgoyette Exp $
+$NetBSD: patch-decode-dimms.1,v 1.3 2020/09/07 14:50:25 pgoyette Exp $
 
 Document the -s option (use spdmem(4)'s sysctl for input)
 
---- eeprom/decode-dimms.1.orig	2018-07-25 07:26:21.321627123 +0800
-+++ eeprom/decode-dimms.1	2018-07-25 07:26:56.967194551 +0800
+--- eeprom/decode-dimms.1.orig	2020-08-27 01:29:04.000000000 -0700
++++ eeprom/decode-dimms.1	2020-09-07 07:41:27.859276571 -0700
 @@ -22,7 +22,7 @@
  decode-dimms \- decode the information found in memory module SPD EEPROMs
  .SH SYNOPSIS
@@ -23,7 +23,7 @@ Document the -s option (use spdmem(4)'s sysctl for input)
  .SH PARAMETERS
  .TP
  .B \-f, --format
-@@ -60,9 +59,17 @@
+@@ -60,12 +59,20 @@
  .B \-X
  Same as -x except treat multibyte hex data as little endian
  .TP
@@ -39,6 +39,9 @@ Document the -s option (use spdmem(4)'s sysctl for input)
 +.TP
  .B \-h, --help
  Display the usage summary
+ .SH BUGS
+ To report bugs or send fixes, please write to the Linux I2C mailing list
+ <linux-i2c@vger.kernel.org>.
 -.SH SEE ALSO
 -.BR decode-vaio (1)
  .SH AUTHORS
author	pgoyette <pgoyette@pkgsrc.org>	2020-09-07 14:50:25 +0000
committer	pgoyette <pgoyette@pkgsrc.org>	2020-09-07 14:50:25 +0000
commit	98457b23ad0b12ab65bf09df896a195352c06677 (patch)
tree	08dc26926dedafc941bf082b0c635d801a26e09c
parent	50fcb18d98e7c814d020247048af98fc40542e05 (diff)
download	pkgsrc-98457b23ad0b12ab65bf09df896a195352c06677.tar.gz