aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--README.md2
-rw-r--r--apt-panopticommon.lua17
-rwxr-xr-xapt-panopticon.lua6
-rwxr-xr-xupdate_apt-panopticon2
4 files changed, 14 insertions, 13 deletions
diff --git a/README.md b/README.md
index 4d80062..57e5be6 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ and [https://git.devuan.org/onefang/apt-panopticon](https://git.devuan.org/onefa
33You can get the cgp graphing source code from [https://sledjhamr.org/cgit/apt-panopticon_cgp/]() (main repo) 33You can get the cgp graphing source code from [https://sledjhamr.org/cgit/apt-panopticon_cgp/]() (main repo)
34and [https://git.devuan.org/onefang/apt-panopticon_cgp](https://git.devuan.org/onefang/apt-panopticon_cgp) (Devuan repo). 34and [https://git.devuan.org/onefang/apt-panopticon_cgp](https://git.devuan.org/onefang/apt-panopticon_cgp) (Devuan repo).
35 35
36The issue tracker is at [https://sledjhamr.org/mantisbt/project_page.php?project_id=13](https://sledjhamr.org/mantisbt/project_page.php?project_id=13) 36The issue tracker is at [https://sledjhamr.org/TODO/apt-panopticon/index.HTML](https://sledjhamr.org/TODO/apt-panopticon/index.HTML)
37 37
38 38
39Installation. 39Installation.
diff --git a/apt-panopticommon.lua b/apt-panopticommon.lua
index 982ff21..22d294a 100644
--- a/apt-panopticommon.lua
+++ b/apt-panopticommon.lua
@@ -8,13 +8,14 @@ APT.version = '0.3 alpha'
8APT.protocols = {"ftp", "http", "https", "rsync"} 8APT.protocols = {"ftp", "http", "https", "rsync"}
9APT.tests = {'raw', 'Integrity', 'Protocol', 'Redirects', 'Updated', 'URLSanity', 'Speed'} 9APT.tests = {'raw', 'Integrity', 'Protocol', 'Redirects', 'Updated', 'URLSanity', 'Speed'}
10--APT.releases = {"jessie", "ascii", "beowulf", "chimaera", "daedalus", "ceres"} 10--APT.releases = {"jessie", "ascii", "beowulf", "chimaera", "daedalus", "ceres"}
11APT.releases = {"beowulf","chimaera", "daedalus", "excalibur", "ceres"} 11APT.releases = {"chimaera", "daedalus", "excalibur", "freia", "ceres"}
12APT.subRels = {'backports', 'proposed-updates', 'security', 'updates'} 12APT.subRels = {'backports', 'proposed-updates', 'security', 'updates'}
13APT.notExist = 13APT.notExist =
14{ 14{
15 'excalibur-backports', 15 'chimaera-backports',
16 'excalibur-security', 16 'freia-backports',
17 'excalibur-updates', 17 'freia-security',
18 'freia-updates',
18 'ceres-backports', -- These will never exist, it's our code name for the testing suite. 19 'ceres-backports', -- These will never exist, it's our code name for the testing suite.
19 'ceres-proposed-updates', 20 'ceres-proposed-updates',
20 'ceres-updates', 21 'ceres-updates',
@@ -84,13 +85,13 @@ APT.options =
84 { 85 {
85 typ = "number", 86 typ = "number",
86 help = "", 87 help = "",
87 value = 240, 88 value = 180,
88 }, 89 },
89 timeout = 90 timeout =
90 { 91 {
91 typ = "number", 92 typ = "number",
92 help = "", 93 help = "",
93 value = 24, 94 value = 42,
94 }, 95 },
95 timeouts = 96 timeouts =
96 { 97 {
@@ -550,9 +551,9 @@ APT.exe = function(c)
550 -- 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. 551 -- 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.
551 -- --kill-after means "send KILL after TERM fails. 552 -- --kill-after means "send KILL after TERM fails.
552 if nil == c then 553 if nil == c then
553 self.cmd = 'timeout --kill-after=10.0 --foreground 42.0s ' .. self.cmd 554 self.cmd = 'timeout --kill-after=10.0s --foreground 42.0s ' .. self.cmd
554 else 555 else
555 self.cmd = 'timeout --kill-after=10.0 --foreground ' .. c .. ' ' .. self.cmd 556 self.cmd = 'timeout --kill-after=10.0s --foreground ' .. c .. ' ' .. self.cmd
556 end 557 end
557 return self 558 return self
558 end 559 end
diff --git a/apt-panopticon.lua b/apt-panopticon.lua
index e701726..3c990c6 100755
--- a/apt-panopticon.lua
+++ b/apt-panopticon.lua
@@ -36,16 +36,16 @@ local notExist =
36local referenceDebs = 36local referenceDebs =
37{ 37{
38 -- Debian package. 38 -- Debian package.
39 "merged/pool/DEBIAN/main/d/debian-keyring/debian-keyring_2025.03.23_all.deb", 39 "merged/pool/DEBIAN/main/d/debian-keyring/debian-keyring_2025.07.26_all.deb",
40 -- Debian security package. NOTE this one should always be redirected? 40 -- Debian security package. NOTE this one should always be redirected?
41 "merged/pool/DEBIAN-SECURITY/updates/main/e/exim4/exim4_4.96-15+deb12u7_all.deb", 41 "merged/pool/DEBIAN-SECURITY/updates/main/e/exim4/exim4_4.96-15+deb12u7_all.deb",
42} 42}
43local referenceDevs = 43local referenceDevs =
44{ 44{
45 -- Devuan package. NOTE this one should not get redirected, but that's more a warning than an error. 45 -- Devuan package. NOTE this one should not get redirected, but that's more a warning than an error.
46 "merged/pool/DEVUAN/main/d/devuan-keyring/devuan-keyring_2023.10.07_all.deb", -- Devuan keeps changing this since the key expiry incident. 46 "merged/pool/DEVUAN/main/d/devuan-keyring/devuan-keyring_2025.08.09_all.deb", -- Devuan keeps changing this since the key expiry incident.
47 -- 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. 47 -- 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.
48 "merged/pool/DEVUAN/main/b/base-files/base-files_13.7devuan1_amd64.deb", 48 "merged/pool/DEVUAN/main/b/base-files/base-files_14devuan1_amd64.deb",
49} 49}
50 50
51local keyring = "/usr/share/keyrings/devuan-archive-keyring.gpg" 51local keyring = "/usr/share/keyrings/devuan-archive-keyring.gpg"
diff --git a/update_apt-panopticon b/update_apt-panopticon
index 969cc8f..384ebdb 100755
--- a/update_apt-panopticon
+++ b/update_apt-panopticon
@@ -42,7 +42,7 @@ if [ "z" != "z${KEEPDAYS}" ] ; then
42fi 42fi
43 43
44rm ../results; ln -s apt-panopticon/results_old ../results 44rm ../results; ln -s apt-panopticon/results_old ../results
45flock -n apt-panopticon.lock ionice -c3 nice -n 19 timeout --kill-after=20.0 --foreground 8.5m ./apt-panopticon.lua && rm apt-panopticon.lock 45flock -n apt-panopticon.lock ionice -c3 nice -n 19 timeout --kill-after=20.0s --foreground 8.5m ./apt-panopticon.lua && rm apt-panopticon.lock
46if [ -f apt-panopticon.lock ] ; then 46if [ -f apt-panopticon.lock ] ; then
47 echo "apt-panopticon timed out." 47 echo "apt-panopticon timed out."
48 ./laggers 48 ./laggers