From f3fc4d5753f0ebb9107738183b9c5cea1bf3f618 Mon Sep 17 00:00:00 2001
From: Clemens Buchacher <clemens.buchacher@xavo.com>
Date: Fri, 14 Sep 2018 09:08:32 +0200
Subject: [PATCH] downgrade to gnupg1
The build sometimes fails to remove the `S.gpg-agent.extra` unix domain socket
when it deletes the temporary GNUPGHOME directory after running gpg commands.
rm: can't remove '/tmp/tmp.hBDCKF/S.gpg-agent.extra': No such file or directory
The previous gpg --recv-keys command starts the gpg-agent. The gpg-agent
connects to the following sockets and does not terminate on its own.
/ # netstat -x -a -p
Active UNIX domain sockets (servers and established)
Proto RefCnt Flags Type State I-Node PID/Program name Path
unix 2 [ ACC ] STREAM LISTENING 8627378 17/dirmngr /root/.gnupg/S.dirmngr
unix 2 [ ACC ] STREAM LISTENING 8625135 21/gpg-agent /root/.gnupg/S.gpg-agent
unix 2 [ ACC ] STREAM LISTENING 8625136 21/gpg-agent /root/.gnupg/S.gpg-agent.extra
unix 2 [ ACC ] STREAM LISTENING 8625137 21/gpg-agent /root/.gnupg/S.gpg-agent.browser
unix 2 [ ACC ] STREAM LISTENING 8625138 21/gpg-agent /root/.gnupg/S.gpg-agent.ssh
If one of the sockets is removed, then the agent terminates and removes the
other sockets as well. This causes a race condition between `rm -rf $GNUPGHOME`
and gpg-agent. If gpg-agent manages to remove the sockets first, then `rm`
fails while trying to remove the same socket.
Move to gnupg1 in alpine just like we do for stretch. Gnupg version 1
does not launch a GPG agent. It is not possible to disable gpg-agent in
gnupg version 2.
(cherry picked from commit 684e1c634b56694633402c34e73b0cbc500b8d0e)
Signed-off-by: Konstantin Pavlov <thresh@videolan.org>
---
mainline/alpine-perl/Dockerfile | 2 +-
mainline/alpine/Dockerfile | 2 +-
stable/alpine-perl/Dockerfile | 2 +-
stable/alpine/Dockerfile | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/mainline/alpine-perl/Dockerfile b/mainline/alpine-perl/Dockerfile
index f201b0c..30997c4 100644
--- a/mainline/alpine-perl/Dockerfile
+++ b/mainline/alpine-perl/Dockerfile
@@ -62,7 +62,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
zlib-dev \
linux-headers \
curl \
- gnupg \
+ gnupg1 \
libxslt-dev \
gd-dev \
geoip-dev \
diff --git a/mainline/alpine/Dockerfile b/mainline/alpine/Dockerfile
index 2afc41f..a3dcbbd 100644
--- a/mainline/alpine/Dockerfile
+++ b/mainline/alpine/Dockerfile
@@ -61,7 +61,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
zlib-dev \
linux-headers \
curl \
- gnupg \
+ gnupg1 \
libxslt-dev \
gd-dev \
geoip-dev \
diff --git a/stable/alpine-perl/Dockerfile b/stable/alpine-perl/Dockerfile
index f5a2d01..efa664e 100644
--- a/stable/alpine-perl/Dockerfile
+++ b/stable/alpine-perl/Dockerfile
@@ -62,7 +62,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
zlib-dev \
linux-headers \
curl \
- gnupg \
+ gnupg1 \
libxslt-dev \
gd-dev \
geoip-dev \
diff --git a/stable/alpine/Dockerfile b/stable/alpine/Dockerfile
index 83de706..9dc45b6 100644
--- a/stable/alpine/Dockerfile
+++ b/stable/alpine/Dockerfile
@@ -61,7 +61,7 @@ RUN GPG_KEYS=B0F4253373F8F6F510D42178520A9993A1C052F8 \
zlib-dev \
linux-headers \
curl \
- gnupg \
+ gnupg1 \
libxslt-dev \
gd-dev \
geoip-dev \
--
GitLab