1 files changed, 21 insertions, 7 deletions

diff --git a/apt-panopticon.lua b/apt-panopticon.lua
index 5658d48..50e6177 100755
--- a/apt-panopticon.lua
+++ b/apt-panopticon.lua
@@ -21,7 +21,7 @@ local releaseFiles =
     "Release.gpg",                      --
 --    "InRelease",                      -- 3.7 MB
 --    "main/binary-all/Packages.xz",    -- 2.6 GB for all that changed recently.
-    -- Contents files.                  -- 3.3 GB
+--    Contents files.                   -- 3.3 GB
 --    "main/Contents-all.xz",
 --    "main/Contents-amd64.xz",
 --    "main/Contents-arm64.xz",
@@ -36,15 +36,16 @@ local notExist =
 local referenceDebs =
 {
     -- Debian package.
-    "merged/pool/DEBIAN/main/d/debian-keyring/debian-keyring_2024.03.24_all.deb",
+    "merged/pool/DEBIAN/main/d/debian-keyring/debian-keyring_2025.03.23_all.deb",
     -- Debian security package.  NOTE this one should always be redirected?
-    "merged/pool/DEBIAN-SECURITY/updates/main/a/apt/apt-transport-https_1.8.2.2_all.deb",
+    "merged/pool/DEBIAN-SECURITY/updates/main/e/exim4/exim4_4.96-15+deb12u7_all.deb",
 }
 local referenceDevs =
 {
     -- Devuan package.  NOTE this one should not get redirected, but that's more a warning than an error.
-    "merged/pool/DEVUAN/main/d/devuan-keyring/devuan-keyring_2023.10.07_all.deb",       -- Devuan keeps changing this since the key expiry incident.
-    "merged/pool/DEVUAN/main/b/base-files/base-files_13.2devuan1_all.deb",
+    "merged/pool/DEVUAN/main/d/devuan-keyring/devuan-keyring_2025.06.02_all.deb",       -- Devuan keeps changing this since the key expiry incident.
+    -- Hmmm used to be _all, but it was split to the individual archs.  Seems pointless, each one is the same size as the previous all.
+    "merged/pool/DEVUAN/main/b/base-files/base-files_13.8devuan1_amd64.deb",
 }
 
 local keyring = "/usr/share/keyrings/devuan-archive-keyring.gpg"
@@ -276,7 +277,11 @@ checkHEAD = function (host, URL, r, retry, sanity)
         if "http" == PU.scheme then
             hdr = '-H "Host: ' .. host .. '"'
         end
-        IP = '--connect-to "' .. pu.host .. '::' .. PU.host .. ':"'
+        if '-6' == APT.IPv46 then
+            IP = '--connect-to "' .. pu.host .. '::[' .. PU.host .. ']:"'
+        else
+            IP = '--connect-to "' .. pu.host .. '::' .. PU.host .. ':"'
+        end
         fname = host .. "_" .. pu.host .. '_' .. PU.host .. "_" .. PU.path:gsub("/", "_") .. ".txt"
     end
     os.execute('rm -f results/HEADERS_' .. fname .. ' 2>/dev/null; rm -f results/STATUS_' .. fname .. ' 2>/dev/null; touch results/STATUS_' .. fname)
@@ -307,6 +312,10 @@ checkHEAD = function (host, URL, r, retry, sanity)
     if "https" == PU.scheme and APT.options.roundRobin.value == host then
         I(spcd .. "Not testing " .. APT.lnk(URL) .. " mirrors wont have the correct HTTPS certificate for the round robin.", host)
         return
+-- TODO - For some odd reason, sometimes one of these is nil.  Dig deeper to figure out why.
+    elseif "https" == PU.scheme and (APT.mirrors[host] ~= nil) and (APT.mirrors[host].Protocols ~= nil) and (not APT.mirrors[host].Protocols.https) then
+        I(spcd .. "Not testing " .. APT.lnk(URL) .. " host doesn't support HTTPS.", host)
+        return
     else
         I(spcd .. check .. " " .. APT.lnk(URL), host)
     end
@@ -624,6 +633,10 @@ end
 
 
 local validateURL = function(m)
+    if "http://" == m.BaseURL:sub(1, 7) then
+        W("HTTP at beginning of BaseURL in mirror_list.txt!  " .. m.BaseURL, "", "", m.FQDN)
+        m.BaseURL = m.BaseURL:sub(1, -2)
+    end
     if " " == m.BaseURL:sub(-1, -1) then
         W("space at end of BaseURL in mirror_list.txt!  " .. m.BaseURL, "", "", m.FQDN)
         m.BaseURL = m.BaseURL:sub(1, -2)
@@ -636,7 +649,7 @@ local validateURL = function(m)
     if nil == p.path then p.path = '' end
     if nil ~= p.port then p.authority = authority .. ':' .. p.port end
     if nil == m.FQDN then W("Something wrong in FQDN from mirror_list.txt!  nil", "", "", p.authority) else
-        if m.FQDN ~= p.authority then W("Something wrong in FDQN from mirror_list.txt!  " .. m.FDQN, "", "", p.authority) end
+        if m.FQDN ~= p.authority then W("Something wrong in FQDN from mirror_list.txt!  " .. m.FQDN, "", "", p.authority) end
     end
     if nil == m.BaseURL then W("Something wrong in BaseURL from mirror_list.txt!  nil", "", "", p.authority) else
         if m.BaseURL ~= (p.authority .. p.path) then W("Something wrong in BaseURL from mirror_list.txt!  " .. m.BaseURL, "", "", p.authority) end
@@ -1158,6 +1171,7 @@ if 0 < #arg then
             checkFiles(pu.host, pu.host, pu.path:sub(1, -1), file);
         end
     else
+        if "-6" == APT.IPv46 then arg[2] = '[' .. arg[2] .. ']' end
         checkHost(pu.host, pu.host, pu.path, arg[2], arg[3])
     end