changed keyserver urls to work on my computer

helpers/config

@@ -2,6 +2,7 @@
 #
 #    Copyright (C) 2008-2010  Rubén Rodríguez <ruben@trisquel.info>
 #    Copyright (C)      2014  Santiago Rodriguez <santi@trisquel.info>
+#    Copyright (C)      2019  David Trudgian <dave@trudgian.net>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -19,12 +20,14 @@
 #
 
 set -e
+set -o pipefail
+
 export LANG=C LC_TIME=C
 PACKAGE=$(echo $0 |/bin/sed s/make-//g)
 
 export DATE=$(date +'%a, %d %b %Y %T %z')
 
-export DATA=$PWD/DATA/$PACKAGE
+export DATA="$PWD/DATA/$PACKAGE"
 if ! [ 1$COMPONENT = "1main" ]
 then
     COMPONENT=${COMPONENT:-universe}
@@ -36,20 +39,20 @@ fi
 export DEBIAN_FRONTEND=noninteractive
 export DEBEMAIL=trisquel-devel@listas.trisquel.info
 export DEBFULLNAME="Trisquel GNU/Linux developers"
-export CODENAME=flidas
-export REVISION=8.0
+export CODENAME=etiona
+export REVISION=9.0
 export RELEASE=trisquel
 export DOMAIN=trisquel.info
-export UPSTREAM=xenial
-export UPSTREAMRELEASE=16.04
+export UPSTREAM=bionic
+export UPSTREAMRELEASE=18.04
 MIRROR=http://archive.ubuntu.com/ubuntu
 DEVELMIRROR=http://devel.trisquel.info/trisquel/$CODENAME
 LOCALMIRROR=http://archive.trisquel.info/trisquel
 LOCAL_APT=`mktemp -d` 
 
-export RPL=$PWD/DATA/rpl
+export RPL="$PWD/DATA/rpl"
 rpl(){
-$RPL $@
+$RPL "$@"
 }
 
 pkgversion(){
@@ -84,6 +87,7 @@ cat << EOF > ${LOCAL_APT}/etc/apt.conf
 Dir::State "${LOCAL_APT}/var/lib/apt";
 Dir::State::status "${LOCAL_APT}/var/lib/dpkg/status";
 Dir::Etc::SourceList "${LOCAL_APT}/etc/apt.sources.list";
+Dir::Etc::SourceParts "";
 Dir::Cache "${LOCAL_APT}/var/cache/apt";
 pkgCacheGen::Essential "none";
 Dir::Etc::Trusted "${LOCAL_APT}/etc/trusted.gpg";
@@ -104,6 +108,8 @@ apt-key --keyring ${LOCAL_APT}/etc/trusted.gpg adv --keyserver keyserver.ubuntu.
 # Debian gpg keys
 apt-key --keyring ${LOCAL_APT}/etc/trusted.gpg adv --keyserver keyserver.ubuntu.com --recv-keys 9D6D8F6BC857C906 > /dev/null
 apt-key --keyring ${LOCAL_APT}/etc/trusted.gpg adv --keyserver keyserver.ubuntu.com --recv-keys 8B48AD6246925553 > /dev/null
+# Tor gpg key
+apt-key --keyring ${LOCAL_APT}/etc/trusted.gpg adv --import DATA/tor/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc
 fi
 
 # Also import the repository key optionally listed in the helper
@@ -131,7 +137,7 @@ apt-get source $PACKAGE --download-only -c ${LOCAL_APT}/etc/apt.conf
 if grep -q "BEGIN PGP SIGNATURE" *.dsc; then
   KEY=$(gpg2 --keyid-format 0xlong --verify  *.dsc  2>&1 | grep 0x | sed 's/.*0x//' || true)
   [ -z "$KEY" ] && KEY=$(gpgv --keyring ${LOCAL_APT}/etc/trusted.gpg *.dsc 2>&1 | egrep ".SA key" | sed 's/.*.SA key //' || true)
-  apt-key --keyring ${LOCAL_APT}/etc/trusted.gpg adv --recv-keys --keyserver hkps://keyserver.ubuntu.com:443 $KEY > /dev/null
+  apt-key --keyring ${LOCAL_APT}/etc/trusted.gpg adv --recv-keys --keyserver keyserver.ubuntu.com $KEY > /dev/null
   touch ${LOCAL_APT}/keyring.gpg
   gpg2 --keyring ${LOCAL_APT}/keyring.gpg --import ${LOCAL_APT}/etc/trusted.gpg
   gpg2 --verify --keyring ${LOCAL_APT}/etc/trusted.gpg *.dsc
@@ -231,3 +237,4 @@ fi
 }
 
 
+