From aae952576a5cbda3cac15edad1477416a8f8c132 Mon Sep 17 00:00:00 2001
From: onefang
Date: Sat, 10 Sep 2022 00:54:10 +1000
Subject: More keyring fixes.

---
 apt-panopticon.lua | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apt-panopticon.lua b/apt-panopticon.lua
index 81ac7e0..2caad1c 100755
--- a/apt-panopticon.lua
+++ b/apt-panopticon.lua
@@ -46,6 +46,9 @@ local referenceDevs =
     "merged/pool/DEVUAN/main/d/devuan-keyring/devuan-keyring_2022.09.04_all.deb",
 }
 
+local keyring = "/usr/share/keyrings/devuan-archive-keyring.gpg"
+--local keyring = "/etc/apt/trusted.gpg.d/devuan-keyring-2022-archive.gpg"
+
 local curlStatus = 
 {
     [1 ] = "Unsupported protocol. This build of curl has no support for this protocol.",
@@ -863,7 +866,7 @@ local parseRelease = function(host)
 		postDownload(host, n, o)
 		if (".gpg" == o:sub(-4, -1)) and (APT.checkFile('results/' .. host .. '/merged/dists/' .. n .. '/' .. o)) then
 		    if APT.testing("Integrity") then
-			local status = APT.exe( "gpgv --keyring /usr/share/keyrings/devuan-keyring.gpg results/" .. host .. "/merged/dists/" .. n .. '/' .. o .. 
+			local status = APT.exe( "gpgv --keyring " .. keyring .. " results/" .. host .. "/merged/dists/" .. n .. '/' .. o .. 
 						" results/" .. host .. "/merged/dists/" .. n .. '/' .. o:sub(1, -5)):Nice():noErr():log():Do().status
 			if 0 ~= status then E("GPG check failed for " .. host .. "/merged/dists/" .. n .. '/' .. o, "http", "Integrity", host) end
 -- TODO - should check the PGP sig of InRelease as well.
-- 
cgit v1.1