sbolint: include patches/ in pkglist.txt.

2 files changed, 23 insertions, 14 deletions

diff --git a/pkglist.txt b/pkglist.txt
index 550e654..e85a92d 100644
--- a/pkglist.txt
+++ b/pkglist.txt
@@ -437,6 +437,7 @@ indent
 inetd
 infozip
 inih
+iniparser
 inotify-tools
 intel-vaapi-driver
 intltool
@@ -1225,6 +1226,7 @@ quota
 radeontool
 rcs
 rdesktop
+rdfind
 rdist
 re2c
 readline
@@ -1285,6 +1287,7 @@ smartmontools
 smproxy
 snownews
 socat
+sof-firmware
 solid
 soma
 sonnet
diff --git a/sbolint b/sbolint
index 42957e5..ac9a54e 100755
--- a/sbolint
+++ b/sbolint
@@ -2150,11 +2150,10 @@ sub check_package_list {
 	}
 }
 
-# 20260816 bkw: find the right PACKAGES.TXT for this Slackware release.
-# PACKAGES_TXT will override the URL, in case someone's doing something nonstandard.
-sub get_package_list_url {
-	my $url = $ENV{PACKAGES_TXT};
-	return $url if $url;
+# 20260816 bkw: find the right pair of PACKAGES.TXT files for this Slackware release.
+sub get_package_list_urls {
+	my $urlbase = $ENV{SBOLINT_MIRROR} || "https://slackware.uk/slackware";
+	$urlbase =~ s,/*$,,;
 
 	my $bits = "";
 	my $stable = 0;
@@ -2186,13 +2185,14 @@ sub get_package_list_url {
 	die "$SELF: can't update package list for -current\n" unless $stable;
 	die "$SELF: can't tell what version of Slackware this is\n" unless defined $slackver;
 
-	$url = "https://slackware.uk/slackware/slackware$bits-$slackver/PACKAGES.TXT";
-	return $url;
+	return (
+			"$urlbase/slackware$bits-$slackver/PACKAGES.TXT",
+			"$urlbase/slackware$bits-$slackver/patches/PACKAGES.TXT");
 }
 
 # 20260816 bkw: note: don't use die() here, use warn() followed by exit(1).
 sub update_package_list {
-	my $url = get_package_list_url();
+	my @urls = get_package_list_urls();
 	my $file = find_package_list();
 
 	if(not defined $file) {
@@ -2200,23 +2200,29 @@ sub update_package_list {
 		exit 1;
 	}
 
-	warn "$SELF: updating $file from $url\n";
+	warn "$SELF: updating $file from $urls[0] and $urls[1]\n";
 
 	my $count = 0;
-	open my $pl, ">", $file or die "$SELF: $file: $!\n";
-	open my $curl, "-|", "curl", "-sS", $url or do {
+	open my $curl, "-|", "curl", "-sS", $urls[0], $urls[1] or do {
 	  	warn "$SELF: curl: $!\n";
 		exit 1;
 	};
+
+	my %pkgs;
 	while(<$curl>) {
 		chomp;
 		next unless /^PACKAGE DESCRIPTION/;
-		my $p = <$curl>;
+		chomp(my $p = <$curl>);
 		$p =~ s/:.*//;
-		print $pl $p;
-		$count++;
+		$pkgs{$p}++;
 	}
 	close $curl;
+
+	open my $pl, ">", $file or die "$SELF: $file: $!\n";
+	for(sort keys %pkgs) {
+		$count++;
+		print $pl $_ . "\n";
+	}
 	close $pl;
 
 	warn "$SELF: $count package names written to $file\n";