From: Nick Porter <nick@portercomputing.co.uk>
Date: Mon, 30 Dec 2024 08:51:06 +0000 (+0000)
Subject: apt-key add is long deprecated
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3575103c5a4d5b5dfd121ca9439951f79c2cda5e;p=thirdparty%2Ffreeradius-server.git

apt-key add is long deprecated
---

diff --git a/.github/actions/ci-tests/action.yml b/.github/actions/ci-tests/action.yml
index 1f70b9d7a6b..c44a6e0928c 100644
--- a/.github/actions/ci-tests/action.yml
+++ b/.github/actions/ci-tests/action.yml
@@ -94,8 +94,9 @@ runs:
     - name: Set up repositories
       shell: bash
       run: |
-        wget -O - https://openresty.org/package/pubkey.gpg | sudo apt-key add -
-        echo "deb http://openresty.org/package/ubuntu $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/openresty.list
+        sudo install -d -o root -g root -m 0755 /etc/apt/keyrings
+        curl -s https://openresty.org/package/pubkey.gpg | sudo tee /etc/apt/keyrings/openresty.gpg
+        echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/openresty.gpg] http://openresty.org/package/ubuntu $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/openresty.list
 
         sudo apt-get update
 
diff --git a/.github/actions/freeradius-deps/action.yml b/.github/actions/freeradius-deps/action.yml
index 277dc1dc921..6db710df077 100644
--- a/.github/actions/freeradius-deps/action.yml
+++ b/.github/actions/freeradius-deps/action.yml
@@ -71,7 +71,9 @@ runs:
     - name: NetworkRADIUS signing key
       if: ${{ runner.os != 'macOS' }}
       shell: bash
-      run: sudo /bin/sh -c "curl -sS https://packages.inkbridgenetworks.com/pgp/packages%40networkradius.com | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=yes apt-key add -"
+      run: |
+        sudo install -d -o root -g root -m 0755 /etc/apt/keyrings
+        curl -s 'https://packages.inkbridgenetworks.com/pgp/packages.networkradius.com.asc' | sudo tee /etc/apt/keyrings/packages.networkradius.com.asc > /dev/null
 
     - name: Set up NetworkRADIUS extras repository
       if: ${{ runner.os != 'macOS' }}
@@ -79,7 +81,7 @@ runs:
       run: |
         DIST=$(lsb_release -is | tr '[:upper:]' '[:lower:]')
         RELEASE=$(lsb_release -cs)
-        sudo /bin/sh -c "echo \"deb http://packages.networkradius.com/extras/${DIST}/${RELEASE} ${RELEASE} main\" \
+        sudo /bin/sh -c "echo \"deb [arch=amd64 signed-by=/etc/apt/keyrings/packages.networkradius.com.asc] http://packages.networkradius.com/extras/${DIST}/${RELEASE} ${RELEASE} main\" \
           > /etc/apt/sources.list.d/networkradius-extras.list"
 
     #  Currently GitHub runners have a conflicting version of libhashkit2 installed which breaks dependency installation
diff --git a/.github/workflows/ci-deb.yml b/.github/workflows/ci-deb.yml
index b0cf934da28..f431ec9757d 100644
--- a/.github/workflows/ci-deb.yml
+++ b/.github/workflows/ci-deb.yml
@@ -102,7 +102,9 @@ jobs:
         apt-get install -y --no-install-recommends make gcc libc6-dev equivs file curl gnupg2 lsb-release
 
     - name: NetworkRADIUS signing key
-      run: curl -sS https://packages.inkbridgenetworks.com/pgp/packages%40networkradius.com | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=yes apt-key add -
+      run: |
+        install -d -o root -g root -m 0755 /etc/apt/keyrings
+        curl -s 'https://packages.inkbridgenetworks.com/pgp/packages.networkradius.com.asc' | tee /etc/apt/keyrings/packages.networkradius.com.asc > /dev/null
 
     - name: Set up NetworkRADIUS extras repository
       run: |
@@ -112,7 +114,7 @@ jobs:
             RELEASE=$(cat /etc/debian_version | awk -F \/ '{ print $(NF) }')
         fi
         [ "$RELEASE" != "trixie" ] || RELEASE=sid
-        echo "deb http://packages.networkradius.com/extras/${DIST}/${RELEASE} ${RELEASE} main" \
+        echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/packages.networkradius.com.asc] http://packages.networkradius.com/extras/${DIST}/${RELEASE} ${RELEASE} main" \
           > /etc/apt/sources.list.d/networkradius-extras.list
 
     - name: Update apt repository lists
@@ -224,7 +226,9 @@ jobs:
         apt-get install -y --no-install-recommends procps curl gnupg2 ca-certificates lsb-release
 
     - name: NetworkRADIUS signing key
-      run: curl -sS https://packages.inkbridgenetworks.com/pgp/packages%40networkradius.com | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=yes apt-key add -
+      run: |
+        install -d -o root -g root -m 0755 /etc/apt/keyrings
+        curl -s 'https://packages.inkbridgenetworks.com/pgp/packages.networkradius.com.asc' | tee /etc/apt/keyrings/packages.networkradius.com.asc > /dev/null
 
     - name: Set up NetworkRADIUS extras repository
       run: |
@@ -234,7 +238,7 @@ jobs:
             RELEASE=$(cat /etc/debian_version | awk -F \/ '{ print $(NF) }')
         fi
         [ "$RELEASE" != "trixie" ] || RELEASE=sid
-        echo "deb http://packages.networkradius.com/extras/${DIST}/${RELEASE} ${RELEASE} main" \
+        echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/packages.networkradius.com.asc] http://packages.networkradius.com/extras/${DIST}/${RELEASE} ${RELEASE} main" \
           > /etc/apt/sources.list.d/networkradius-extras.list
 
     - name: Update apt repository lists