27 lines
1.1 KiB
Text
27 lines
1.1 KiB
Text
|
--- cmdline/apt-key.orig Thu Mar 2 06:28:27 2006
|
||
|
|
+++ cmdline/apt-key Tue Oct 24 16:11:08 2006
|
||
|
|
@@ -5,18 +5,17 @@
|
||
|
|
# We don't use a secret keyring, of course, but gpg panics and
|
||
|
|
# implodes if there isn't one available
|
||
|
|
|
||
|
|
-GPG_CMD="gpg --no-options --no-default-keyring --secret-keyring /etc/apt/secring.gpg --trustdb-name /etc/apt/trustdb.gpg"
|
||
|
|
-GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg"
|
||
|
|
+GPG_CMD="gpg --no-options --no-default-keyring --secret-keyring @PREFIX@/etc/apt/secring.gpg --trustdb-name @PREFIX@/etc/apt/trustdb.gpg"
|
||
|
|
+GPG="$GPG_CMD --keyring @PREFIX@/etc/apt/trusted.gpg"
|
||
|
|
|
||
|
|
|
||
|
|
-ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg
|
||
|
|
-REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg
|
||
|
|
+ARCHIVE_KEYRING=@PREFIX@/share/apt/keyrings/freebsd-archive-keyring.gpg
|
||
|
|
+REMOVED_KEYS=@PREFIX@/share/apt/keyrings/freebsd-archive-removed-keys.gpg
|
||
|
|
|
||
|
|
|
||
|
|
update() {
|
||
|
|
if [ ! -f $ARCHIVE_KEYRING ]; then
|
||
|
|
- echo >&2 "ERROR: Can't find the archive-keyring"
|
||
|
|
- echo >&2 "Is the debian-archive-keyring package installed?"
|
||
|
|
+ echo >&2 "ERROR: Can't find the archive-keyring: $ARCHIVE_KEYRING"
|
||
|
|
exit 1
|
||
|
|
fi
|
||
|
|
|