diff options
| author | David Kalnischkies <kalnischkies@gmail.com> | 2013-11-30 23:11:43 +0100 |
|---|---|---|
| committer | David Kalnischkies <kalnischkies@gmail.com> | 2013-12-01 15:51:33 +0100 |
| commit | 5b2c6ddcc0e45c92c544032ad2bb91bdf7222d7c (patch) | |
| tree | 5b0950ba24d0f0d50e37db8f5dfdcc6cd479ce9d /vendor | |
| parent | f87338d2da95ba7d55a1a67b4506717e94d49bca (diff) | |
generate apt-key script with vendor info about keys
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.
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/debian/apt-vendor.ent | 2 | ||||
| -rwxr-xr-x | vendor/getinfo | 2 | ||||
| -rw-r--r-- | vendor/ubuntu/apt-vendor.ent | 2 |
3 files changed, 5 insertions, 1 deletions
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"> |