From 25cd3ded69a79c2a7eb3d858e041f1509f5f5ed8 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <david@kalnischkies.de>
Date: Fri, 27 Dec 2024 02:16:56 +0000
Subject: Remove leftovers of the apt-key removal

References: a00fbbdb28cc31e78882301c2efe7218583ab4cb
---
 vendor/README                   | 11 +++++------
 vendor/blankon/apt-vendor.ent   |  4 ----
 vendor/debian/apt-vendor.ent    |  4 ----
 vendor/getinfo                  |  2 +-
 vendor/procursus/apt-vendor.ent |  4 ----
 vendor/raspbian/apt-vendor.ent  |  4 ----
 vendor/steamos/apt-vendor.ent   |  4 ----
 vendor/ubuntu/apt-vendor.ent    |  4 ----
 8 files changed, 6 insertions(+), 31 deletions(-)

(limited to 'vendor')

diff --git a/vendor/README b/vendor/README
index 6846c8455..3b344d5ad 100644
--- a/vendor/README
+++ b/vendor/README
@@ -2,10 +2,10 @@ The vendor system in APT is an experiment to help distributions ship a stock
 apt release instead of applying documentation patches to it, increasing
 maintenance burden for everyone and hiding 'interesting' patches in the mix.
 
-The provided information is used in the apt-key script and in documentation
-like manpages and example configuration files. If you have patches modifying
-additional bits and pieces currently not covered by this system please
-contact us so we can change this!
+The provided information is used in documentation like man pages and
+example configuration files. If you have patches modifying additional
+bits and pieces currently not covered by this system please contact us
+so we can change this!
 
 
 == Adding a new vendor
@@ -39,8 +39,7 @@ by opening a bug in the Debian BTS against apt with a patch attached.
 The format used is the one DocBook XML uses. The file is included as an
 entity file in the manpages xml source, so the syntax has to be valid!
 
-The keyring-* settings are additionally used also in the creation of the
-apt-key script and the keyring-package in particular as a dependency for apt.
+The keyring-package setting is used as a dependency for apt.
 
 The field current-codename is optional and can be used in sources.list.in.
 
diff --git a/vendor/blankon/apt-vendor.ent b/vendor/blankon/apt-vendor.ent
index ea7625f90..a2d0d640b 100644
--- a/vendor/blankon/apt-vendor.ent
+++ b/vendor/blankon/apt-vendor.ent
@@ -1,10 +1,6 @@
 <!-- details about the keys used by the distribution -->
 <!ENTITY keyring-distro "BlankOn">
 <!ENTITY keyring-package "<package>blankon-keyring</package>">
-<!ENTITY keyring-filename "<filename>/usr/share/keyrings/blankon-archive-keyring.gpg</filename>">
-<!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/blankon-archive-removed-keys.gpg</filename>">
-<!ENTITY keyring-master-filename "/usr/share/keyrings/blankon-master-keyring.gpg">
-<!ENTITY keyring-uri "http://arsip.blankonlinux.or.id/blankon/project/blankon-archive-keyring.gpg">
 <!ENTITY current-codename "tambora">
 
 <!ENTITY sourceslist-list-format "deb http://arsip.blankonlinux.or.id/blankon &current-codename; main restricted
diff --git a/vendor/debian/apt-vendor.ent b/vendor/debian/apt-vendor.ent
index 4d02343b2..864f5a8df 100644
--- a/vendor/debian/apt-vendor.ent
+++ b/vendor/debian/apt-vendor.ent
@@ -1,10 +1,6 @@
 <!-- details about the keys used by the distribution -->
 <!ENTITY keyring-distro "Debian">
 <!ENTITY keyring-package "<package>debian-archive-keyring</package>">
-<!ENTITY keyring-filename "">
-<!ENTITY keyring-removed-filename "">
-<!ENTITY keyring-master-filename "">
-<!ENTITY keyring-uri "">
 
 <!ENTITY sourceslist-list-format "deb http://deb.debian.org/debian &debian-stable-codename; main contrib non-free non-free-firmware
 deb http://deb.debian.org/debian &debian-stable-codename;-updates main contrib non-free non-free-firmware
diff --git a/vendor/getinfo b/vendor/getinfo
index 2ef257c90..0a2dcf333 100755
--- a/vendor/getinfo
+++ b/vendor/getinfo
@@ -64,7 +64,7 @@ case "$1" in
 debian-stable-codename|debian-oldstable-codename|debian-testing-codename|ubuntu-codename)
 	getrawfield "$1" "$VERBATIM"
 	;;
-sourceslist-list-format|keyring-package|keyring-filename|keyring-master-filename|keyring-removed-filename|keyring-uri|current-codename)
+sourceslist-list-format|keyring-package|current-codename)
 	exec $0 --vendor $CURRENT_VENDOR 'vendor' "$@"
 	;;
 vendor)
diff --git a/vendor/procursus/apt-vendor.ent b/vendor/procursus/apt-vendor.ent
index 0dd1d7a95..32d9fefee 100644
--- a/vendor/procursus/apt-vendor.ent
+++ b/vendor/procursus/apt-vendor.ent
@@ -1,10 +1,6 @@
 <!-- details about the keys used by the distribution -->
 <!ENTITY keyring-distro "Procursus">
 <!ENTITY keyring-package "<package>procursus-keyring</package>">
-<!ENTITY keyring-filename "">
-<!ENTITY keyring-removed-filename "">
-<!ENTITY keyring-master-filename "">
-<!ENTITY keyring-uri "">
 <!ENTITY current-codename "big_sur">
 
 <!ENTITY sourceslist-list-format "deb https://apt.procurs.us/ &current-codename; main">
diff --git a/vendor/raspbian/apt-vendor.ent b/vendor/raspbian/apt-vendor.ent
index 96d9fb71b..e3b960381 100644
--- a/vendor/raspbian/apt-vendor.ent
+++ b/vendor/raspbian/apt-vendor.ent
@@ -1,10 +1,6 @@
 <!-- details about the keys used by the distribution -->
 <!ENTITY keyring-distro "Raspbian">
 <!ENTITY keyring-package "<package>raspbian-archive-keyring</package>">
-<!ENTITY keyring-filename "<filename>/usr/share/keyrings/raspbian-archive-keyring.gpg</filename>">
-<!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/raspbian-archive-removed-keys.gpg</filename>">
-<!ENTITY keyring-master-filename "">
-<!ENTITY keyring-uri "">
 
 <!ENTITY sourceslist-list-format "deb http://mirrordirector.raspbian.org/raspbian &debian-stable-codename; main contrib non-free">
 <!ENTITY sourceslist-sources-format "Types: deb
diff --git a/vendor/steamos/apt-vendor.ent b/vendor/steamos/apt-vendor.ent
index 7cf100fc4..2752999f9 100644
--- a/vendor/steamos/apt-vendor.ent
+++ b/vendor/steamos/apt-vendor.ent
@@ -1,10 +1,6 @@
 <!-- details about the keys used by the distribution -->
 <!ENTITY keyring-distro "SteamOS">
 <!ENTITY keyring-package "<package>valve-archive-keyring</package>">
-<!ENTITY keyring-filename "<filename>/usr/share/keyrings/valve-archive-keyring.gpg</filename>">
-<!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/valve-archive-removed-keys.gpg</filename>">
-<!ENTITY keyring-master-filename "">
-<!ENTITY keyring-uri "">
 <!ENTITY current-codename "alchemist">
 
 <!ENTITY sourceslist-list-format "deb http://repo.steampowered.com/steamos &current-codename; main contrib non-free
diff --git a/vendor/ubuntu/apt-vendor.ent b/vendor/ubuntu/apt-vendor.ent
index dcebc9209..9cf7b55fb 100644
--- a/vendor/ubuntu/apt-vendor.ent
+++ b/vendor/ubuntu/apt-vendor.ent
@@ -1,10 +1,6 @@
 <!-- details about the keys used by the distribution -->
 <!ENTITY keyring-distro "Ubuntu">
 <!ENTITY keyring-package "<package>ubuntu-keyring</package>">
-<!ENTITY keyring-filename "<filename>/usr/share/keyrings/ubuntu-archive-keyring.gpg</filename>">
-<!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/ubuntu-archive-removed-keys.gpg</filename>">
-<!ENTITY keyring-master-filename "/usr/share/keyrings/ubuntu-master-keyring.gpg">
-<!ENTITY keyring-uri "http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg">
 
 <!ENTITY sourceslist-list-format "deb http://us.archive.ubuntu.com/ubuntu &ubuntu-codename; main restricted
 deb http://security.ubuntu.com/ubuntu &ubuntu-codename;-security main restricted
-- 
cgit v1.2.3-70-g09d2