Update upstream source from tag 'upstream/3.3.19-1'

Update to upstream version '3.3.19-1'
with Debian dir d1c00d4f00f0e59ee8db3c7430c67e4e4edeb440

3 files changed, 156 insertions, 58 deletions

diff --git a/inxi b/inxi
index a599e30..d43c220 100755
--- a/inxi
+++ b/inxi
@@ -48,8 +48,8 @@ use POSIX qw(ceil uname strftime ttyname);
 
 ## INXI INFO ##
 my $self_name='inxi';
-my $self_version='3.3.18';
-my $self_date='2022-06-13';
+my $self_version='3.3.19';
+my $self_date='2022-06-16';
 my $self_patch='00';
 ## END INXI INFO ##
 
@@ -10774,45 +10774,59 @@ sub cp_cpu_arch {
 				$year = '';} # dates uncertain, 1999 start
 		}
 		elsif ($family eq '6'){
-			if ($model =~ /^(1|2)$/){
-				$arch = 'K7 Athlon Classic';
+			## verified
+			if ($model =~ /^(6)$/){
+				$arch = 'K7'; # 6:2:Palomino, duron
+				$process = 'AMD 180nm';
+				$year = '2002-04';}
+			elsif ($model =~ /^(8)$/){
+				$arch = 'K7'; # 8:1:thoroughbred, duron
+				$process = 'AMD 130nm';
+				$year = '2002-04';}
+			## to confirm
+			elsif ($model =~ /^(1|2)$/){
+				$arch = 'K7'; # Athlon Classic
 				$process = 'AMD 180-250nm';
 				$year = '1999-2002';}
 			elsif ($model =~ /^(3|4)$/){
-				$arch = 'K7 Thunderbird';
+				$arch = 'K7'; # Thunderbird
 				$process = 'AMD 180nm';
 				$year = '2000-01';}
-			elsif ($model =~ /^(6|7|8|A)$/){
-				$arch = 'K7 Palomino+'; # athlon xp
+			elsif ($model =~ /^(7|A)$/){
+				$arch = 'K7'; #  Palomino+; athlon xp
 				$process = 'AMD 130-180nm';
-				$year = '2001';}
+				$year = '2001-04';}
 			else {
 				$arch = 'K7';
 				$process = 'AMD 130-250nm';
-				$year = '';}
+				$year = '2001-04';}
 		}
 		# note: family F K8 needs granular breakdowns, was a long lived family
 		elsif ($family eq 'F'){
-			# positive IDs, but sub arch difficult, can be stepping based
-			if ($model =~ /^(1C)$/){
-				$arch = 'K8'; # Palermo
+			# positive IDs, but sub arch difficult, stepping based
+			if ($model =~ /^(7|C)$/){
+				$arch = 'K8'; # 7:A:clawhammer ADA3500DEP4AS; C:0:NewCastle
+				$process = 'AMD 130nm';
+				$year = '2004-05';}
+			elsif ($model =~ /^(1C|23|28|2F)$/){
+				$arch = 'K8'; # 1C:Palermo;2F:A:Venice; 28:1:Manchester; 23:2:Toledo
 				$process = 'AMD 90nm';
-				$year = '2001';}
-			elsif ($model =~ /^(7F)$/){
-				$arch = 'K8 rev.F+'; # Lima
+				$year = '2004-06';}
+			elsif ($model =~ /^(6B|7F)$/){
+				$arch = 'K8'; # Lima; 68:1:Brisbane
 				$process = 'AMD 65nm';
-				$year = '2005';}
-			# generic IDs, try to reduce these to solid over time
-			elsif ($model =~ /^(4|5|7|8|B|C|E|F|14|15|17|18|1B|1F)$/){
+				$year = '2005-06';}
+			## to confirm
+			elsif ($model =~ /^(4|5|8|B|E|F|14|15|17|18|1B|1F)$/){
 				$arch = 'K8';
 				$process = 'AMD 65-130nm';
 				$year = '';}
-			elsif ($model =~ /^(21|23|24|25|27|28|2C|2F)$/){
-				$arch = 'K8 rev.E';
+			elsif ($model =~ /^(21|24|25|27|2C)$/){
+				$arch = 'K8'; # rev.E 
 				$process = 'AMD 65-130nm';
 				$year = '';}
-			elsif ($model =~ /^(41|43|48|4B|4C|4F|5D|5F|68|6B|6C|6F|7C|C1)$/){
-				$arch = 'K8 rev.F+';
+			elsif ($model =~ /^(41|43|48|4B|4C|4F|5D|5F|68|6C|6F|7C|C1)$/){
+				$arch = 'K8'; # rev.F+
 				$process = 'AMD 65-130nm';
 				$year = '';}
 			else {
@@ -10821,14 +10835,18 @@ sub cp_cpu_arch {
 				$year = '';}
 		}
 		elsif ($family eq '10'){
-			if ($model =~ /^(2|4|5|6|8|9|A)$/){
+			if ($model =~ /^(6)$/){
+				$arch = 'K10';  # 6:2:Regor
+				$process = 'AMD 45nm';
+				$year = '2009-14';}
+			elsif ($model =~ /^(2|4|5|8|9|A)$/){
 				$arch = 'K10';
 				$process = 'AMD 32-65nm';
-				$year = '2007-12';}
+				$year = '2007-14';}
 			else {
 				$arch = 'K10';
 				$process = 'AMD 32-65nm';
-				$year = '2007-12';}
+				$year = '2007-14';}
 		}
 		# very loose, all stepping 1: covers athlon x2, sempron, turion x2
 		# years unclear, could be 2005 start, or 2008
@@ -10965,9 +10983,9 @@ sub cp_cpu_arch {
 			else {
 				$arch = 'Zen 3/4';
 				$note = $check;
-				$process = 'TSMC n5 (5nm)-7';
+				$process = 'TSMC n5 (5nm)';
 				$year = '2021-22';}
-			# Zen 5: TSCM n3
+			# Zen 5: TSMC n3
 		}
 	}
 	elsif ($type eq 'arm'){
@@ -10976,9 +10994,9 @@ sub cp_cpu_arch {
 		else {
 			$arch='ARM';}
 	}
-# 	elsif ($type eq 'ppc'){
-# 		$arch='PPC';
-# 	}
+	#	elsif ($type eq 'ppc'){
+	#		$arch='PPC';
+	#	}
 	# aka VIA
 	elsif ($type eq 'centaur'){ 
 		if ($family eq '5'){
@@ -11342,7 +11360,7 @@ sub cp_cpu_arch {
 			# elsif ($model =~ /^()$/){
 			#	$arch = 'Meteor Lake';
 			#	$process = 'Intel 4';}
-			# Granite Rapids: INtel 3 (7nm)
+			# Granite Rapids: Intel 3 (7nm)
 			elsif ($model =~ /^(9E)$/){
 				if ($stepping == 9){
 					$arch = 'Kaby Lake';
@@ -22089,14 +22107,22 @@ sub get_repos_linux {
 		my $counter = 0;
 		@files = main::globber("$apt.d/*.list");
 		push(@files, $apt);
+		# prefilter list for logging
+		@files = grep {-f $_} @files; # may not have $apt file.
 		main::log_data('data',"apt repo files:\n" . main::joiner(\@files, "\n", 'unset')) if $b_log;
 		foreach (sort @files){
-			# altlinux/pclinuxos use rpms in apt files
-			$data = repo_builder($_,'apt','^\s*(deb|rpm)') if -r $_;
-			push(@$rows,@$data);
+			# altlinux/pclinuxos use rpms in apt files, -r to be on safe side
+			if (-r $_){
+				$data = repo_builder($_,'apt','^\s*(deb|rpm)');
+				push(@$rows,@$data);
+			}
 		}
-		#@files = main::globber("$fake_data_dir/repo/apt/*.sources");
+		# @files = main::globber("$fake_data_dir/repo/apt/*.sources");
 		@files = main::globber("$apt.d/*.sources");
+		# prefilter list for logging, sometimes globber returns non-prsent files.
+		@files = grep {-f $_} @files;
+		# @files = ("$fake_data_dir/repo/apt/deb822-u193-3.sources",
+		# "$fake_data_dir/repo/apt/deb822-u193-3.sourcesdeb822-u193-4-signed-by.sources");
 		main::log_data('data',"apt deb822 repo files:\n" . main::joiner(\@files, "\n", 'unset')) if $b_log;
 		foreach $file (@files){
 			# critical: whitespace is the separator, no logical ordering of 
@@ -22143,14 +22169,12 @@ sub get_repos_linux {
 					$apt_types = '';
 					$b_apt_enabled = 1;
 				}
-				# print "row:$row\n";
 				elsif ($row =~ /^Types:\s*(.*)/i){
-					# print "ath:$type_holder\n";
+					# print "1:$1\n";
 					$apt_types = $1;
 				}
 				elsif ($row =~ /^Enabled:\s*(.*)/i){
-					my $status = $1;
-					$b_apt_enabled = ($status =~ /\b(disable|false|off|no|without)\b/i) ? 0: 1;
+					$b_apt_enabled = ($1 =~ /\b(disable|false|off|no|without)\b/i) ? 0: 1;
 				}
 				elsif ($row =~ /^[^#]+:\//){
 					my $url = $row;
@@ -22454,8 +22478,10 @@ sub get_repos_linux {
 	}
 	# TinyCore 
 	if (-e $tce_app || -f $tce_file || -f $tce_file2){
-		$data = repo_builder($tce_file,'tce','^\s*[^#]+');
-		push(@$rows,@$data);
+		if (-f $tce_file){
+			$data = repo_builder($tce_file,'tce','^\s*[^#]+');
+			push(@$rows,@$data);
+		}
 		if (-f $tce_file2){
 			$data = repo_builder($tce_file2,'tce','^\s*[^#]+');
 			push(@$rows,@$data);
@@ -22467,8 +22493,10 @@ sub get_repos_linux {
 		push(@files,main::globber("$xbps_dir_2*.conf")) if -d $xbps_dir_2;
 		main::log_data('data',"xbps repo files:\n" . main::joiner(\@files, "\n", 'unset')) if $b_log;
 		foreach (sort @files){
-			$data = repo_builder($_,'xbps','^\s*repository\s*=','\s*=\s*',1) if -r $_;
-			push(@$rows,@$data);
+			if (-r $_){
+				$data = repo_builder($_,'xbps','^\s*repository\s*=','\s*=\s*',1);
+				push(@$rows,@$data);
+			}
 		}
 	}
 	# Mandriva/Mageia using: urpmq
@@ -23455,20 +23483,22 @@ sub load_lm_sensors {
 	my (@sensors_data,@values);
 	my ($adapter,$holder,$type) = ('','','');
 		if ($fake{'sensors'}){
-		# my $file = "$fake_data_dir/sensors/amdgpu-w-fan-speed-stretch-k10.txt";
-		# my $file = "$fake_data_dir/sensors/peci-tin-geggo.txt";
-		# my $file = "$fake_data_dir/sensors/sensors-w-other-biker.txt";
-		# my $file = "$fake_data_dir/sensors/sensors-asus-chassis-1.txt";
-		# my $file = "$fake_data_dir/sensors/sensors-devnull-1.txt";
-		# my $file = "$fake_data_dir/sensors/sensors-jammin1.txt";
-		# my $file = "$fake_data_dir/sensors/sensors-mx-incorrect-1.txt";
-		# my $file = "$fake_data_dir/sensors/sensors-maximus-arch-1.txt";
-		# my $file = "$fake_data_dir/sensors/kernel-58-sensors-ant-1.txt";
-		# my $file = "$fake_data_dir/sensors/sensors-zenpower-nvme-2.txt";
-		# my $file = "$fake_data_dir/sensors/sensors-pch-intel-1.txt";
-		# my $file = "$fake_data_dir/sensors/sensors-ppc-sr71.txt";
-		 my $file = "$fake_data_dir/sensors/sensors-applesmc-1.txt";
-		 @sensors_data = main::reader($file);
+		# my $file;
+		# $file = "$fake_data_dir/sensors/amdgpu-w-fan-speed-stretch-k10.txt";
+		# $file = "$fake_data_dir/sensors/peci-tin-geggo.txt";
+		# $file = "$fake_data_dir/sensors/sensors-w-other-biker.txt";
+		# $file = "$fake_data_dir/sensors/sensors-asus-chassis-1.txt";
+		# $file = "$fake_data_dir/sensors/sensors-devnull-1.txt";
+		# $file = "$fake_data_dir/sensors/sensors-jammin1.txt";
+		# $file = "$fake_data_dir/sensors/sensors-mx-incorrect-1.txt";
+		# $file = "$fake_data_dir/sensors/sensors-maximus-arch-1.txt";
+		# $file = "$fake_data_dir/sensors/kernel-58-sensors-ant-1.txt";
+		# $file = "$fake_data_dir/sensors/sensors-zenpower-nvme-2.txt";
+		# $file = "$fake_data_dir/sensors/sensors-pch-intel-1.txt";
+		# $file = "$fake_data_dir/sensors/sensors-ppc-sr71.txt";
+		# $file = "$fake_data_dir/sensors/sensors-coretemp-acpitz-1.txt";
+		# $file = "$fake_data_dir/sensors/sensors-applesmc-1.txt";
+		# @sensors_data = main::reader($file);
 	}
 	else {
 		# only way to get sensor array data? Unless using sensors -j, but can't assume json 
@@ -23507,6 +23537,9 @@ sub load_lm_sensors {
 			elsif ($adapter =~ /^(amdgpu|intel|nouveau|radeon)-/){
 				$type = 'gpu';
 			}
+			elsif ($adapter =~ /^(acpitz)-/ && $adapter !~ /^(acpitz-virtual)-/ ){
+				$type = 'board';
+			}
 			else {
 				$type = 'main';
 			}
diff --git a/inxi.1 b/inxi.1
index 3a7e123..632a476 100644
--- a/inxi.1
+++ b/inxi.1
@@ -15,7 +15,7 @@
 .\"  with this program; if not, write to the Free Software Foundation, Inc.,
 .\"  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 .\"  
-.TH INXI 1 "2022\-06\-13" "inxi" "inxi manual"
+.TH INXI 1 "2022\-06\-16" "inxi" "inxi manual"
 
 .SH NAME
 inxi  \- Command line system information script for console and IRC
diff --git a/inxi.changelog b/inxi.changelog
index a33b528..a4e5e56 100644
--- a/inxi.changelog
+++ b/inxi.changelog
@@ -1,4 +1,69 @@
 ================================================================================
+Version: 3.3.19
+Patch: 00
+Date: 2022-06-16
+--------------------------------------------------------------------------------
+RELEASE NOTES:
+--------------------------------------------------------------------------------
+
+This is a quick bug fix release, and one other fix, the bug only impact Debian/
+Ubuntu distros.
+
+--------------------------------------------------------------------------------
+KNOWN ISSUES:
+
+1. Nothing new.
+
+--------------------------------------------------------------------------------
+BUGS:
+
+1. Two repo_builders could create an undefined array ref situation, one in Antix
+I have no idea was triggered since it requires an apt file be not readable but 
+existing, which just isn't a normal debian/ubuntu situation. Void linux was the
+other. Since those were the only two with a -r file test, there must be some 
+case where the file was not readable, though I have no idea what that case might
+be.
+
+Further examination showed this can hit all apt based systems, the cause is no
+/etc/apt/sources.list file, which is a possible scenario across all apt systems.
+
+--------------------------------------------------------------------------------
+FIXES:
+
+1. Blacklisted all apcitz sensors that are not acpitz-virtual, which is the cpu
+temp. This may help resolve issues for some users where for example using 
+acpitz-acpi, which is not the cpu sensor.
+
+--------------------------------------------------------------------------------
+ENHANCEMENTS:
+
+1. A few more AMD family F empirical IDs made.
+
+--------------------------------------------------------------------------------
+CHANGES:
+
+1. None.
+
+--------------------------------------------------------------------------------
+DOCUMENTATION:
+
+1. Started to split/merge inxi-data.txt and inxi-resources.txt into topic 
+specific files, like inxi-sensors.txt, inxi-graphics.txt, etc. inxi-values and
+inxi-resources have just gotten too big over the years.
+
+--------------------------------------------------------------------------------
+CODE:
+
+1. Corrected in RepoItem possible use of undefined array references.
+
+2. Finally, a full releawse tool!! inxi-perl/tools/release.pl. Validates man,
+verifies pinxi commands to avoid errors, then updates man/options/changelog 
+html pages for smxi.org/docs, and then syncs pinxi* files to inxi*.
+
+--------------------------------------------------------------------------------
+-- Harald Hope - Mon, 16 Jun 2022 15:43:00 -0700
+
+================================================================================
 Version: 3.3.18
 Patch: 00
 Date: 2022-06-13