|
@@ -21,7 +21,7 @@ stage3base=${MIRROR}/releases/x86/autobuilds
|
|
|
portage=${MIRROR}/snapshots/portage-latest.tar.bz2
|
|
|
|
|
|
# Don't rely on the HKP outbounding port being open
|
|
|
-gpg_wwwserver='http://wwwkeys.eu.pgp.net/pks/lookup?op=get&search=0x${fpr}'
|
|
|
+gpg_wwwserver='https://zimmermann.mayfirst.org/pks/lookup?op=get&search=0x${fpr}'
|
|
|
gpg_keys=`sed '/^#/d; /^$/d; s/ //g' ${FROM}/pubkeys`
|
|
|
|
|
|
mfpl=https://support.mayfirst.org/raw-attachment/wiki/mfpl_certificate_authority/mfpl.crt
|
|
@@ -79,7 +79,8 @@ if [ "$2" = fresh -o ! -d ${LIVECD}/src ]; then
|
|
|
|
|
|
|
|
|
sinfo "Downloading HKPS CA certificate"
|
|
|
- wget -N -nv -P ${LIVECD}/mirror/keys --no-check-certificate ${mfpl} \
|
|
|
+ wget -N -q -P ${LIVECD}/mirror/keys --no-check-certificate ${mfpl}
|
|
|
+ wget -N -nv -P ${LIVECD}/mirror/keys --ca-certificate=${LIVECD}/mirror/keys/mfpl.crt \
|
|
|
${mfpl}.jamie.asc ${mfpl}.dkg.asc
|
|
|
|
|
|
|
|
@@ -90,7 +91,8 @@ if [ "$2" = fresh -o ! -d ${LIVECD}/src ]; then
|
|
|
keyid=`echo -n ${fpr} | tail -c 8`
|
|
|
|
|
|
if [ ! -e ${LIVECD}/mirror/keys/${org}-${keyid}.asc ]; then
|
|
|
- eval wget -nv -O ${LIVECD}/mirror/keys/${org}-${keyid}.asc \"${gpg_wwwserver}\"
|
|
|
+ eval wget -nv --ca-certificate=${LIVECD}/mirror/keys/mfpl.crt \
|
|
|
+ -O ${LIVECD}/mirror/keys/${org}-${keyid}.asc \"${gpg_wwwserver}\"
|
|
|
fi
|
|
|
|
|
|
if type gpg 1>/dev/null 2>&1; then
|