6 files changed, 74 insertions, 29 deletions

diff --git a/README.md b/README.md
index 7e5d6d2..57e5be6 100644
--- a/README.md
+++ b/README.md
@@ -29,11 +29,11 @@ The details of that are yet to be determined.
 
 
 You can get the source code from [https://sledjhamr.org/cgit/apt-panopticon/](https://sledjhamr.org/cgit/apt-panopticon/) (main repo)
-and [https://git.devuan.dev/onefang/apt-panopticon](https://git.devuan.dev/onefang/apt-panopticon) (Devuan repo).
+and [https://git.devuan.org/onefang/apt-panopticon](https://git.devuan.org/onefang/apt-panopticon) (Devuan repo).
 You can get the cgp graphing source code from [https://sledjhamr.org/cgit/apt-panopticon_cgp/]() (main repo)
-and [https://git.devuan.dev/onefang/apt-panopticon_cgp](https://git.devuan.dev/onefang/apt-panopticon_cgp) (Devuan repo).
+and [https://git.devuan.org/onefang/apt-panopticon_cgp](https://git.devuan.org/onefang/apt-panopticon_cgp) (Devuan repo).
 
-The issue tracker is at [https://sledjhamr.org/mantisbt/project_page.php?project_id=13](https://sledjhamr.org/mantisbt/project_page.php?project_id=13)
+The issue tracker is at [https://sledjhamr.org/TODO/apt-panopticon/index.HTML](https://sledjhamr.org/TODO/apt-panopticon/index.HTML)
 
 
 Installation.
diff --git a/Report-web_2.html b/Report-web_2.html
index 592e8c6..2882179 100644
--- a/Report-web_2.html
+++ b/Report-web_2.html
@@ -1,5 +1,8 @@
     <p><font style='background-color:red; color:black'>EXPERIMENTAL CODE - double check all results you see here, and read the logs if it's important.</font></p>
     <p>The full list of Devuan package mirrors is available at the URL: <a href='https://pkgmaster.devuan.org/mirror_list.txt'>https://pkgmaster.devuan.org/mirror_list.txt</a></p>
-    <p>Due to the nature of the tests, some errors or warnings will be counted several times. &nbsp; The links in the table and DNS list go to the detailed testing logs.</p>
+    <p>Due to the nature of the tests, some errors or warnings will be counted several times.  There will be some duplication.</p>
+    <p>Due to the nature of the tests, some errors or warnings will be counted several times.  There will be some duplication.</p>
+    <p>Due to the nature of the tests, some errors or warnings will be counted several times.  There will be some duplication.</p>
+    <p>The links in the table and DNS list go to the detailed testing logs.</p>
 
     <hr>
diff --git a/apt-panopticommon.lua b/apt-panopticommon.lua
index e31c22f..1507ae9 100644
--- a/apt-panopticommon.lua
+++ b/apt-panopticommon.lua
@@ -8,13 +8,14 @@ APT.version = '0.3 alpha'
 APT.protocols = {"ftp", "http", "https", "rsync"}
 APT.tests = {'raw', 'Integrity', 'Protocol', 'Redirects', 'Updated', 'URLSanity', 'Speed'}
 --APT.releases = {"jessie", "ascii", "beowulf", "chimaera", "daedalus", "ceres"}
-APT.releases = {"beowulf","chimaera", "daedalus", "excalibur", "ceres"}
+APT.releases = {"chimaera", "daedalus", "excalibur", "freia", "ceres"}
 APT.subRels = {'backports', 'proposed-updates', 'security', 'updates'}
 APT.notExist =
 {
-    'excalibur-backports',
-    'excalibur-security',
-    'excalibur-updates',
+    'chimaera-backports',
+--    'excalibur-backports',
+--    'excalibur-security',
+--    'excalibur-updates',
     'ceres-backports',          -- These will never exist, it's our code name for the testing suite.
     'ceres-proposed-updates',
     'ceres-updates',
@@ -84,13 +85,13 @@ APT.options =
         {
             typ = "number",
             help = "",
-            value = 240,
+            value = 180,
         },
     timeout =
         {
             typ = "number",
             help = "",
-            value = 5,
+            value = 42,
         },
     timeouts =
         {
@@ -501,6 +502,8 @@ APT.readCmd = function(cmd)
             table.insert(result, l)
         end
     end
+    -- While this does return the same things as os.execute(), it's just as useless.
+    output:close()
     return result
 end
 
@@ -548,9 +551,9 @@ APT.exe = function(c)
         -- timeout returns a status of - command status if --preserve-status; "128+9" (actually 137) if --kill-after ends up being done; 124 if it had to TERM; command status if all went well.
         -- --kill-after means "send KILL after TERM fails.
         if nil == c then
-            self.cmd = 'timeout --kill-after=10.0 --foreground 42.0s ' .. self.cmd
+            self.cmd = 'timeout --kill-after=10.0s --foreground 42.0s ' .. self.cmd
         else
-            self.cmd = 'timeout --kill-after=10.0 --foreground ' .. c .. ' ' .. self.cmd
+            self.cmd = 'timeout --kill-after=10.0s --foreground ' .. c .. ' ' .. self.cmd
         end
         return self
     end
@@ -590,8 +593,9 @@ APT.exe = function(c)
             I'm getting 7168 or 0.  No idea what the fuck that is.
         local ok, rslt, status = os.execute(s)
         ]]
+
         local f = APT.readCmd(self.cmd, 'r')
-        -- The last line will be the command's returned status, collect everything else in result.
+    -- The last line will be the command's returned status, collect everything else in result.
         self.status = ''        -- Otherwise the result starts with 0.
         self.result = '\n'
         for i,l in ipairs(f) do
@@ -608,6 +612,28 @@ APT.exe = function(c)
                 E("status |" .. self.status .. '| ' .. self.command)
             end
         end
+
+--[[  While this is more reliable, it breaks stuff that's likely making assumptions that match the old way.
+TODO - fix it later.
+        local f = APT.readCmd(self.cmd .. '; echo "$?"', 'r')
+        -- The last line will be the command's returned status, collect everything else in result.
+        self.status = tonumber(f[#f])
+        f[#f] = nil
+        self.result = '\n'
+        for i,l in ipairs(f) do
+            self.result = self.result .. l .. "\n"
+        end
+        if (137 == self.status) or (124 == self.status) then
+            print("timeout killed " .. self.status .. ' ' .. self.command)
+            print('ERROR ' .. "timeout killed " .. self.status .. ' ' .. self.command)
+        elseif (nil == self.status) then
+            print("status |" .. "NIL" .. '| ' .. self.command)
+            E("status |" .. "NIL" .. '| ' .. self.command)
+        elseif (0 ~= self.status) then
+--          print("status |" .. self.status .. '| ' .. self.command)
+            E("status |" .. self.status .. '| ' .. self.command)
+        end
+]]
         return self
     end
     function exe:fork(host)
diff --git a/apt-panopticon-report-email-web.lua b/apt-panopticon-report-email-web.lua
index 2a13975..de63274 100755
--- a/apt-panopticon-report-email-web.lua
+++ b/apt-panopticon-report-email-web.lua
@@ -444,7 +444,9 @@ if nil == email then C("opening mirrors file - " .. e) else
                 "The full results of the mirror checking is available at the URLs:\n\n" ..
                 " https://borta.devuan.dev/apt-panopticon/results/Report-web.html\n    (updated once every hour)\n" ..
                 " https://sledjhamr.org/apt-panopticon/results/Report-web.html\n    (updated once every ten minutes)\n\n" ..
-                "Due to the nature of the tests, some errors or warnings will be \ncounted several times.  " ..
+                "Due to the nature of the tests, some errors or warnings will be \ncounted several times.  There will be some duplication.\n\n" ..
+                "Due to the nature of the tests, some errors or warnings will be \ncounted several times.  There will be some duplication.\n\n" ..
+                "Due to the nature of the tests, some errors or warnings will be \ncounted several times.  There will be some duplication.\n\n" ..
                 "Refer to the logs on the web page for details.\n\n" ..
                 "Please see below the current status of the Devuan Package Mirror \nnetwork:\n\n" ..
                 "==== package mirror status " .. os.date("!%F %H:%M") .. " GMT ====\n" ..
@@ -484,9 +486,9 @@ if nil == email then C("opening mirrors file - " .. e) else
                 "* This means that this protocol isn't actually supported, but the test was run ayway.\n\n" ..
                 "Thanks for your precious help in ensuring that Devuan GNU+Linux \nremains a universal, stable, dependable, free operating system.\n\n" ..
                 "You can get the source code from https://sledjhamr.org/cgit/apt-panopticon/about/ (main repo)\n" ..
-                "and from https://git.devuan.dev/onefang/apt-panopticon' (Devuan repo).\n" ..
+                "and from https://git.devuan.org/onefang/apt-panopticon' (Devuan repo).\n" ..
                 "You can get the cgp graphing source code from https://sledjhamr.org/cgit/apt-panopticon_cgp/about/ (main repo)\n" .. 
-                "and https://git.devuan.dev/onefang/apt-panopticon_cgp (Devuan repo)\n\n" ..
+                "and https://git.devuan.org/onefang/apt-panopticon_cgp (Devuan repo)\n\n" ..
                 "Love\n\n" ..
                 "The Dev1Devs\n\n")
     email:close()
@@ -621,9 +623,9 @@ if nil == web then C("opening mirrors file - " .. e) else
     web:write( "<hr>\n<hr>\n<p>The <a href='Report-email.txt'>email report</a>. &nbsp; " ..
                 "All <a href='../results'>the logs and other output</a>. &nbsp; " ..
                 "You can get the <a href='https://sledjhamr.org/cgit/apt-panopticon/about/'>source code here (main repo)</a>" ..
-                "and <a href='https://git.devuan.dev/onefang/apt-panopticon'>here (Devuan repo)</a>. &nbsp;" ..
+                "and <a href='https://git.devuan.org/onefang/apt-panopticon'>here (Devuan repo)</a>. &nbsp;" ..
                 "You can get the cgp graphing <a href='https://sledjhamr.org/cgit/apt-panopticon_cgp/about/'>source code here (main repo)</a>" .. 
-                "and <a href='https://git.devuan.dev/onefang/apt-panopticon_cgp'>here (Devuan repo)</a>.</p>\n"
+                "and <a href='https://git.devuan.org/onefang/apt-panopticon_cgp'>here (Devuan repo)</a>.</p>\n"
                 )
     local whn = APT.exe('TZ="GMT" ls -dl1 --time-style="+%s" results/stamp | cut -d " " -f 6-6'):Do().result:sub(2, -2)
     web:write(  "<p>This run took " .. (os.time() - tonumber("0" .. whn)) .. " seconds. &nbsp &nbsp apt-panopticon version " .. APT.version ..  "  </p>" ..
diff --git a/apt-panopticon.lua b/apt-panopticon.lua
index 5658d48..3c990c6 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.07.26_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.08.09_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_14devuan1_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
 
diff --git a/update_apt-panopticon b/update_apt-panopticon
index dde18a5..384ebdb 100755
--- a/update_apt-panopticon
+++ b/update_apt-panopticon
@@ -6,12 +6,12 @@ PANOPATH="/var/www/html/apt-panopticon"
 cd ${PANOPATH}/apt-panopticon_cgp
 if [ -d .git ] ; then
     git pull > /dev/null
-    chown -R www-data:www-data *
+    chown -hR www-data:www-data *
 fi
 cd ${PANOPATH}/apt-panopticon
 if [ -d .git ] ; then
     git pull > /dev/null
-    chown -R www-data:www-data *
+    chown -hR www-data:www-data *
 fi
 
 # Check if the lock file still exists.
@@ -42,14 +42,14 @@ if [ "z" != "z${KEEPDAYS}" ] ; then
 fi
 
 rm ../results; ln -s apt-panopticon/results_old ../results
-flock -n apt-panopticon.lock ionice -c3 nice -n 19 timeout --kill-after=20.0 --foreground 8.5m ./apt-panopticon.lua && rm apt-panopticon.lock
+flock -n apt-panopticon.lock ionice -c3 nice -n 19 timeout --kill-after=20.0s --foreground 8.5m ./apt-panopticon.lua && rm apt-panopticon.lock
 if [ -f apt-panopticon.lock ] ; then
     echo "apt-panopticon timed out."
     ./laggers
 fi
 rm ../results; ln -s apt-panopticon/results ../results
 
-chown -R www-data:www-data *
+chown -hR www-data:www-data *
 
 # Clean up any mess left over from THIS failed run.
 find results_* -maxdepth 2 ! -name "pkgmaster.devuan.org" -name "*.*" -type d -print0 | xargs -0rt /bin/rm -fr