From 4ebc7346321b683f992ca5638d40a8ba961acf7c Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <anders@zulip.com>
Date: Sun, 31 Mar 2024 13:25:11 -0700
Subject: [PATCH] apt-repos: Temporarily work around Ubuntu 24.04
 non-installable gnupg.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
---
 scripts/lib/setup-apt-repo               | 12 ++++++------
 scripts/setup/apt-repos/zulip/zulip.pref |  9 +++++++++
 2 files changed, 15 insertions(+), 6 deletions(-)
 create mode 100644 scripts/setup/apt-repos/zulip/zulip.pref

diff --git a/scripts/lib/setup-apt-repo b/scripts/lib/setup-apt-repo
index ba8f3a7abc..39c1d91a31 100755
--- a/scripts/lib/setup-apt-repo
+++ b/scripts/lib/setup-apt-repo
@@ -86,6 +86,12 @@ fi
 # Hash to check if the configuration is changed by the script later.
 hashes=$(sha256sum "$SOURCES_FILE" "$PREF_FILE" 2>/dev/null || true)
 
+if [ -e "$LIST_PATH/$LIST.pref" ]; then
+    cp "$LIST_PATH/$LIST.pref" "$PREF_FILE"
+else
+    rm -f "$PREF_FILE"
+fi
+
 pre_setup_deps=(apt-transport-https ca-certificates gnupg curl)
 if ! apt-get -dy install "${pre_setup_deps[@]}"; then
     apt-get update
@@ -95,12 +101,6 @@ apt-get -y install "${pre_setup_deps[@]}"
 apt-key add "$LIST_PATH/"*.asc
 cp "$LIST_PATH/$release.list" "$SOURCES_FILE"
 
-if [ -e "$LIST_PATH/$LIST.pref" ]; then
-    cp "$LIST_PATH/$LIST.pref" "$PREF_FILE"
-else
-    rm -f "$PREF_FILE"
-fi
-
 if [ -e "$LIST_PATH/custom.sh" ]; then
     export LIST_PATH
     export STAMP_FILE
diff --git a/scripts/setup/apt-repos/zulip/zulip.pref b/scripts/setup/apt-repos/zulip/zulip.pref
new file mode 100644
index 0000000000..a906f458b1
--- /dev/null
+++ b/scripts/setup/apt-repos/zulip/zulip.pref
@@ -0,0 +1,9 @@
+# Temporary workaround for
+# https://discourse.ubuntu.com/t/whats-happening-in-noble-repositories/43729/7
+Package: gnupg
+Pin: version 2.4.4-2ubuntu7
+Pin-Priority: 501
+
+Package: nginx-common nginx-full
+Pin: version 1.24.0-2ubuntu4
+Pin-Priority: 501