From 682475d05bf81f24f697fd6f22a604e6303356eb Mon Sep 17 00:00:00 2001 From: Jess Frazelle Date: Fri, 2 Dec 2016 12:02:40 -0800 Subject: [PATCH] fix gpg --no-tty Signed-off-by: Jess Frazelle --- certbot/Dockerfile | 2 +- irssi/Dockerfile | 4 ++-- kernel-builder/install_kernel | 2 +- ricochet/Dockerfile | 2 +- tarsnap/Dockerfile | 2 +- tor-browser/alpha/Dockerfile | 2 +- tor-browser/hardened/Dockerfile | 2 +- tor-browser/stable/Dockerfile | 2 +- tor-messenger/Dockerfile | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/certbot/Dockerfile b/certbot/Dockerfile index 92110fc..8799abf 100644 --- a/certbot/Dockerfile +++ b/certbot/Dockerfile @@ -9,7 +9,7 @@ RUN apt-get update && apt-get install -y \ --no-install-recommends RUN export GNUPGHOME="$(mktemp -d)" \ - && gpg --keyserver pgp.mit.edu --recv-key A2CFB51FA275A7286234E7B24D17C995CD9775F2 \ + && gpg --no-tty --keyserver pgp.mit.edu --recv-key A2CFB51FA275A7286234E7B24D17C995CD9775F2 \ && ( \ cd /tmp \ && curl -O https://dl.eff.org/certbot-auto \ diff --git a/irssi/Dockerfile b/irssi/Dockerfile index 0aa72b8..2711ef4 100644 --- a/irssi/Dockerfile +++ b/irssi/Dockerfile @@ -39,7 +39,7 @@ RUN set -x \ && curl -sSL "https://github.com/irssi/irssi/releases/download/${IRSSI_VERSION}/irssi-${IRSSI_VERSION}.tar.xz.asc" -o /tmp/irssi.tar.xz.asc \ && export GNUPGHOME="$(mktemp -d)" \ # gpg: key DDBEF0E1: public key "The Irssi project " imported - && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 7EE65E3082A5FB06AC7C368D00CCB587DDBEF0E1 \ + && gpg --no-tty --keyserver ha.pool.sks-keyservers.net --recv-keys 7EE65E3082A5FB06AC7C368D00CCB587DDBEF0E1 \ && gpg --batch --verify /tmp/irssi.tar.xz.asc /tmp/irssi.tar.xz \ && rm -r "$GNUPGHOME" /tmp/irssi.tar.xz.asc \ && mkdir -p /usr/src \ @@ -60,7 +60,7 @@ RUN set -x \ && curl -sSL "https://otr.cypherpunks.ca/libotr-${LIB_OTR_VERSION}.tar.gz.asc" -o /tmp/libotr.tar.gz.asc \ && export GNUPGHOME="$(mktemp -d)" \ # gpg: key 42C2ABAD: public key "OTR Dev Team (Signing Key) " imported - && gpg --keyserver pgp.mit.edu --recv-keys 22DF3305DF56667CE15784FCF24DE08F42C2ABAD \ + && gpg --no-tty --keyserver pgp.mit.edu --recv-keys 22DF3305DF56667CE15784FCF24DE08F42C2ABAD \ && gpg --batch --verify /tmp/libotr.tar.gz.asc /tmp/libotr.tar.gz \ && rm -r "$GNUPGHOME" /tmp/libotr.tar.gz.asc \ && mkdir -p /usr/src/libotr \ diff --git a/kernel-builder/install_kernel b/kernel-builder/install_kernel index e74d5b8..f3a171f 100755 --- a/kernel-builder/install_kernel +++ b/kernel-builder/install_kernel @@ -81,7 +81,7 @@ install_kernel(){ curl -sSL -o "${grsecdir}/grsecurity.patch" "https://grsecurity.net/test/grsecurity-${GRSEC_VERSION}.patch" curl -sSL -o "${grsecdir}/grsecurity.patch.sig" "https://grsecurity.net/test/grsecurity-${GRSEC_VERSION}.patch.sig" # add the gpg key - gpg --keyserver pgp.mit.edu --recv-keys "DE94 52CE 46F4 2094 907F 108B 44D1 C0F8 2525 FE49" + gpg --no-tty --keyserver pgp.mit.edu --recv-keys "DE94 52CE 46F4 2094 907F 108B 44D1 C0F8 2525 FE49" # verify the patch gpg --verify $grsecdir/grsecurity.patch.sig fi diff --git a/ricochet/Dockerfile b/ricochet/Dockerfile index c7a99f7..08545f6 100644 --- a/ricochet/Dockerfile +++ b/ricochet/Dockerfile @@ -40,7 +40,7 @@ RUN buildDeps=' \ && curl -sSL "https://ricochet.im/releases/${RICOCHET_VERSION}/ricochet-${RICOCHET_VERSION}-linux-x86_64.tar.bz2.asc" -o /tmp/ricochet.tar.bz2.asc \ && export GNUPGHOME="$(mktemp -d)" \ && chmod 600 "${GNUPGHOME}" \ - && curl -sSL https://ricochet.im/john-brooks.asc | gpg --import \ + && curl -sSL https://ricochet.im/john-brooks.asc | gpg --no-tty --import \ && gpg --fingerprint --keyid-format LONG ${RICOCHET_FINGERPRINT} | grep "9032 CAE4 CBFA 933A 5A21 45D5 FF97 C53F 183C 045D" \ && gpg --verify /tmp/ricochet.tar.bz2.asc \ && tar -vxj --strip-components 1 -C /usr/local/bin -f /tmp/ricochet.tar.bz2 \ diff --git a/tarsnap/Dockerfile b/tarsnap/Dockerfile index 241226c..bbd64d7 100644 --- a/tarsnap/Dockerfile +++ b/tarsnap/Dockerfile @@ -21,7 +21,7 @@ RUN set -x \ zlib-dev \ && curl -sSL "https://www.tarsnap.com/download/tarsnap-autoconf-${TARSNAP_VERSION}.tgz" -o /tmp/tarsnap.tgz \ && curl -sSL "https://www.tarsnap.com/download/tarsnap-sigs-${TARSNAP_VERSION}.asc" -o /tmp/tarsnap.tgz.asc \ - && curl -sSL "https://www.tarsnap.com/tarsnap-signing-key-2015.asc" | gpg --import \ + && curl -sSL "https://www.tarsnap.com/tarsnap-signing-key-2015.asc" | gpg --no-tty --import \ && sha=$(gpg --decrypt /tmp/tarsnap.tgz.asc | awk '{ print $4 }') \ && if [ "$sha" != "$(shasum -a 256 /tmp/tarsnap.tgz | awk '{ print $1 }')" ]; then exit 1; fi \ && mkdir -p /usr/src/tarsnap \ diff --git a/tor-browser/alpha/Dockerfile b/tor-browser/alpha/Dockerfile index b3c39b0..2e06a77 100644 --- a/tor-browser/alpha/Dockerfile +++ b/tor-browser/alpha/Dockerfile @@ -36,7 +36,7 @@ RUN cd /tmp \ && curl -sSOL "https://www.torproject.org/dist/torbrowser/${TOR_VERSION}/tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz" \ && curl -sSOL "https://www.torproject.org/dist/torbrowser/${TOR_VERSION}/tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz.asc" \ && mkdir ~/.gnupg \ - && gpg --keyserver "hkp://pool.sks-keyservers.net" --recv-keys ${TOR_FINGERPRINT} \ + && gpg --no-tty --keyserver "hkp://pool.sks-keyservers.net" --recv-keys ${TOR_FINGERPRINT} \ && gpg --fingerprint --keyid-format LONG ${TOR_FINGERPRINT} | grep "Key fingerprint = EF6E 286D DA85 EA2A 4BA7 DE68 4E2C 6E87 9329 8290" \ && gpg --verify tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz.asc \ && tar -vxJ --strip-components 1 -C /usr/local/bin -f tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz \ diff --git a/tor-browser/hardened/Dockerfile b/tor-browser/hardened/Dockerfile index 61f6be0..8eaadf2 100644 --- a/tor-browser/hardened/Dockerfile +++ b/tor-browser/hardened/Dockerfile @@ -36,7 +36,7 @@ RUN cd /tmp \ && curl -sSOL "https://dist.torproject.org/torbrowser/${TOR_VERSION}/tor-browser-linux64-${TOR_VERSION}_ALL.tar.xz" \ && curl -sSOL "https://dist.torproject.org/torbrowser/${TOR_VERSION}/tor-browser-linux64-${TOR_VERSION}_ALL.tar.xz.asc" \ && mkdir ~/.gnupg \ - && gpg --keyserver "hkp://pool.sks-keyservers.net" --recv-keys ${TOR_FINGERPRINT} \ + && gpg --no-tty --keyserver "hkp://pool.sks-keyservers.net" --recv-keys ${TOR_FINGERPRINT} \ && gpg --fingerprint --keyid-format LONG ${TOR_FINGERPRINT} | grep "Key fingerprint = EF6E 286D DA85 EA2A 4BA7 DE68 4E2C 6E87 9329 8290" \ && gpg --verify tor-browser-linux64-${TOR_VERSION}_ALL.tar.xz.asc \ && tar -vxJ --strip-components 1 -C /usr/local/bin -f tor-browser-linux64-${TOR_VERSION}_ALL.tar.xz \ diff --git a/tor-browser/stable/Dockerfile b/tor-browser/stable/Dockerfile index 03c94b6..90e6633 100644 --- a/tor-browser/stable/Dockerfile +++ b/tor-browser/stable/Dockerfile @@ -36,7 +36,7 @@ RUN cd /tmp \ && curl -sSOL "https://www.torproject.org/dist/torbrowser/${TOR_VERSION}/tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz" \ && curl -sSOL "https://www.torproject.org/dist/torbrowser/${TOR_VERSION}/tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz.asc" \ && mkdir ~/.gnupg \ - && gpg --keyserver "hkp://pool.sks-keyservers.net" --recv-keys ${TOR_FINGERPRINT} \ + && gpg --no-tty --keyserver "hkp://pool.sks-keyservers.net" --recv-keys ${TOR_FINGERPRINT} \ && gpg --fingerprint --keyid-format LONG ${TOR_FINGERPRINT} | grep "Key fingerprint = EF6E 286D DA85 EA2A 4BA7 DE68 4E2C 6E87 9329 8290" \ && gpg --verify tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz.asc \ && tar -vxJ --strip-components 1 -C /usr/local/bin -f tor-browser-linux64-${TOR_VERSION}_en-US.tar.xz \ diff --git a/tor-messenger/Dockerfile b/tor-messenger/Dockerfile index b600abd..76e3a59 100644 --- a/tor-messenger/Dockerfile +++ b/tor-messenger/Dockerfile @@ -36,7 +36,7 @@ RUN cd /tmp && \ curl -sSOL https://dist.torproject.org/tormessenger/${TOR_VERSION}/sha256sums-unsigned-build.txt && \ curl -sSOL https://dist.torproject.org/tormessenger/${TOR_VERSION}/sha256sums-unsigned-build.txt.asc && \ mkdir ~/.gnupg && \ - gpg --keyserver pgp.mit.edu --recv-keys ${TOR_FINGERPRINT} || \ + gpg --no-tty --keyserver pgp.mit.edu --recv-keys ${TOR_FINGERPRINT} || \ gpg --fingerprint --keyid-format LONG ${TOR_FINGERPRINT} | grep "Key fingerprint = E4AC D397 5427 A5BA 8450 A1BE B01C 8B00 6DA7 7FAA" && \ gpg --verify sha256sums-unsigned-build.txt.asc && \ grep $(sha256sum tor-messenger-linux64-${TOR_VERSION}_en-US.tar.xz) sha256sums-unsigned-build.txt && \