From 5b2c6ddcc0e45c92c544032ad2bb91bdf7222d7c Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Sat, 30 Nov 2013 23:11:43 +0100
Subject: generate apt-key script with vendor info about keys
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The apt-key script uses quiet a few keyring files for operation which
are specific to the distribution it is build on and is hence one of the
most patched parts – even if it is not that often used anymore now that
a fragment directory for trusted.gpg exists.
---
 vendor/debian/apt-vendor.ent | 2 ++
 vendor/getinfo               | 2 +-
 vendor/ubuntu/apt-vendor.ent | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'vendor')

diff --git a/vendor/debian/apt-vendor.ent b/vendor/debian/apt-vendor.ent
index 56775bbaa..6cda5995c 100644
--- a/vendor/debian/apt-vendor.ent
+++ b/vendor/debian/apt-vendor.ent
@@ -3,3 +3,5 @@
 <!ENTITY keyring-package "<package>debian-archive-keyring</package>">
 <!ENTITY keyring-filename "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>">
 <!ENTITY keyring-removed-filename "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>">
+<!ENTITY keyring-master-filename "">
+<!ENTITY keyring-uri "">
diff --git a/vendor/getinfo b/vendor/getinfo
index df5a44e5c..ac816e10e 100755
--- a/vendor/getinfo
+++ b/vendor/getinfo
@@ -26,7 +26,7 @@ debian-stable-codename)
 ubuntu-codename)
 	getrawfield 'stable-codename' "${BASEDIR}/../doc/apt-verbatim.ent"
 	;;
-keyring-package)
+keyring-package|keyring-filename|keyring-master-filename|keyring-removed-filename|keyring-uri)
 	getfield "$1"
 	;;
 *)
diff --git a/vendor/ubuntu/apt-vendor.ent b/vendor/ubuntu/apt-vendor.ent
index fd5e5a7cf..caa532699 100644
--- a/vendor/ubuntu/apt-vendor.ent
+++ b/vendor/ubuntu/apt-vendor.ent
@@ -3,3 +3,5 @@
 <!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">
-- 
cgit v1.2.3