|
@@ -21,8 +21,9 @@ TRUSTEDFILE=./etc/apt/trusted.gpg
|
|
|
mkdir -p ./var/lib/apt/keyrings
|
|
mkdir -p ./var/lib/apt/keyrings
|
|
|
TMP_KEYRING=./var/lib/apt/keyrings/maybe-import-keyring.gpg
|
|
TMP_KEYRING=./var/lib/apt/keyrings/maybe-import-keyring.gpg
|
|
|
GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring"
|
|
GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring"
|
|
|
-GPG="$GPG_CMD --keyring $TRUSTEDFILE"
|
|
|
|
|
-MASTER_KEYRING=/usr/share/keyrings/ubuntu-master-keyring.gpg
|
|
|
|
|
|
|
+
|
|
|
|
|
+# FIXME: instead of copying this use apt-key and the buildin apt webserver
|
|
|
|
|
+# to do a real test
|
|
|
|
|
|
|
|
# COPYIED from apt-key.in --------------
|
|
# COPYIED from apt-key.in --------------
|
|
|
|
|
|
|
@@ -40,6 +41,9 @@ GPG_CMD="$GPG_CMD --secret-keyring $SECRETKEYRING"
|
|
|
GPG_CMD="$GPG_CMD --trustdb-name ${TRUSTDBDIR}/trustdb.gpg"
|
|
GPG_CMD="$GPG_CMD --trustdb-name ${TRUSTDBDIR}/trustdb.gpg"
|
|
|
#----------------------------------------- END COPY
|
|
#----------------------------------------- END COPY
|
|
|
|
|
|
|
|
|
|
+GPG="$GPG_CMD --keyring $TRUSTEDFILE"
|
|
|
|
|
+MASTER_KEYRING=/usr/share/keyrings/ubuntu-master-keyring.gpg
|
|
|
|
|
+
|
|
|
msgtest "add_keys_with_verify_against_master_keyring"
|
|
msgtest "add_keys_with_verify_against_master_keyring"
|
|
|
if [ ! -e $MASTER_KEYRING ]; then
|
|
if [ ! -e $MASTER_KEYRING ]; then
|
|
|
echo -n "No $MASTER_KEYRING found"
|
|
echo -n "No $MASTER_KEYRING found"
|