5 files changed, 50 insertions, 11 deletions

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..982ff21 100644
--- a/apt-panopticommon.lua
+++ b/apt-panopticommon.lua
@@ -90,7 +90,7 @@ APT.options =
         {
             typ = "number",
             help = "",
-            value = 5,
+            value = 24,
         },
     timeouts =
         {
@@ -501,6 +501,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
 
@@ -590,8 +592,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 +611,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..7f010cb 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" ..
diff --git a/apt-panopticon.lua b/apt-panopticon.lua
index d7efc0e..30bff59 100755
--- a/apt-panopticon.lua
+++ b/apt-panopticon.lua
@@ -36,9 +36,9 @@ 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_2024.09.22_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+deb12u5_all.deb",
 }
 local referenceDevs =
 {
@@ -277,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)
@@ -629,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)
@@ -641,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
@@ -1163,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..969cc8f 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.
@@ -49,7 +49,7 @@ if [ -f apt-panopticon.lock ] ; then
 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