From: Josh Soref <jsoref@users.noreply.github.com>
Date: Sun, 29 Aug 2021 14:49:48 +0000 (-0400)
Subject: Replace apt-key with curl -o
X-Git-Tag: dnsdist-1.7.0-alpha1~40^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F10678%2Fhead;p=thirdparty%2Fpdns.git

Replace apt-key with curl -o

apt-key is deprecated
---

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 856ddcc26b..43b63a1b03 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -328,9 +328,9 @@ commands:
           name: "Install apt-keys"
           command: |
             if [ "<< parameters.version >>" = "master" ]; then
-              curl https://repo.powerdns.com/CBC8B383-pub.asc | apt-key add -
+              curl https://repo.powerdns.com/CBC8B383-pub.asc -o /etc/apt/trusted.gpg.d/CBC8B383-pub.asc
             else
-              curl https://repo.powerdns.com/FD380FBB-pub.asc | apt-key add -
+              curl https://repo.powerdns.com/FD380FBB-pub.asc -o /etc/apt/trusted.gpg.d/FD380FBB-pub.asc
             fi
       - run:
           name: "Add repository"
diff --git a/.github/workflows/secpoll.yml b/.github/workflows/secpoll.yml
index 545a9ed484..7eba747918 100644
--- a/.github/workflows/secpoll.yml
+++ b/.github/workflows/secpoll.yml
@@ -17,7 +17,7 @@ jobs:
           submodules: recursive
       - run: echo 'deb [arch=amd64] http://repo.powerdns.com/ubuntu focal-auth-master main' | sudo tee /etc/apt/sources.list.d/pdns.list
       - run: "echo -ne 'Package: pdns-*\nPin: origin repo.powerdns.com\nPin-Priority: 600\n' | sudo tee /etc/apt/preferences.d/pdns"
-      - run: curl https://repo.powerdns.com/CBC8B383-pub.asc | sudo apt-key add -
+      - run: sudo curl https://repo.powerdns.com/CBC8B383-pub.asc -o /etc/apt/trusted.gpg.d/CBC8B383-pub.asc
       - run: sudo apt-get update
       - run: sudo systemctl mask pdns
       - run: sudo apt-get install -y pdns-server pdns-backend-sqlite3
diff --git a/build-scripts/docker/repo-test/templates/Dockerfile-debian.jinja2 b/build-scripts/docker/repo-test/templates/Dockerfile-debian.jinja2
index b095e4471f..031db4e51b 100644
--- a/build-scripts/docker/repo-test/templates/Dockerfile-debian.jinja2
+++ b/build-scripts/docker/repo-test/templates/Dockerfile-debian.jinja2
@@ -10,8 +10,8 @@ COPY pkg-pin /etc/apt/preferences.d/pdns
 
 COPY pdns.list.{{ release }}.{{ os }}-{{ os_version }} /etc/apt/sources.list.d/pdns.list
 
-RUN curl https://repo.powerdns.com/FD380FBB-pub.asc | apt-key add -
-RUN curl https://repo.powerdns.com/CBC8B383-pub.asc | apt-key add -
+RUN curl https://repo.powerdns.com/CBC8B383-pub.asc -o /etc/apt/trusted.gpg.d/CBC8B383-pub.asc \
+         https://repo.powerdns.com/FD380FBB-pub.asc -o /etc/apt/trusted.gpg.d/FD380FBB-pub.asc
 RUN apt-get update && apt-get install -y {{ pkg }}
 
 {# in the old script this was just for rec-43, -44 and -45 #}