Change to signed-by and /usr/share/keyrigns

2020.1/aims-desktop/aims-desktop-2020/bin/aims-install-macaulay2

 #!/bin/bash
 
-gpg --keyserver keyserver.ubuntu.com --recv-keys CD9C0E09B0C780943A1AD85553F8BD99F40DCB31
-echo 'deb http://www.math.uiuc.edu/Macaulay2/Repositories/Debian buster main' >/etc/apt/sources.list.d/macaulay2.list
+echo 'deb [signed-by=/usr/share/keyrings/macaulay2-archive-keyring.gpg] http://www.math.uiuc.edu/Macaulay2/Repositories/Debian buster main' >/etc/apt/sources.list.d/macaulay2.list
+gpg --no-default-keyring --keyring /usr/share/keyrings/macaulay2-archive-keyring.gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CD9C0E09B0C780943A1AD85553F8BD99F40DCB31
 apt-get -qq update
 apt-get -y install macaulay2
 pip3 install -t /usr/local/lib/python3.7/ macaulay2-jupyter-kernel

2020.1/aims-desktop/aims-desktop-2020/bin/aims-install-r40

 #!/bin/bash
 
-echo "deb http://cloud.r-project.org/bin/linux/debian buster-cran40/" > /etc/apt/sources.list.d/cran.list
-gpg --keyserver keyserver.ubuntu.com --recv-keys E19F5F87128899B192B1A2C2AD5F960A256A04AF
+echo "deb [signed-by=/usr/share/keyrings/cran-archive-keyring.gpg] http://cloud.r-project.org/bin/linux/debian buster-cran40/" > /etc/apt/sources.list.d/cran.list
+gpg --no-default-keyring --keyring /usr/share/keyrings/cran-archive-keyring.gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys E19F5F87128899B192B1A2C2AD5F960A256A04AF
 apt-get -qq update
 apt-get -yf install r-base r-base-dev r-recommended
 

2020.1/aims-desktop/aims-desktop-2020/bin/aims-install-rstudio

@@ -4,6 +4,9 @@
 #RSTUDIO=https://download1.rstudio.org/desktop/bionic/amd64/rstudio-1.3.959-amd64.deb
 RSTUDIO=https://download1.rstudio.org/desktop/bionic/amd64/rstudio-1.4.1717-amd64.deb
 
+# This key goes into root's keyring not into /usr/share/keyrings as
+# rstudio does not have a repository; we only use dpkg-sig to verify the signature
+# on the downloaded package
 gpg --keyserver keyserver.ubuntu.com --recv-keys 3F32EE77E331692F
 apt-get -qq update
 apt-get -y install r-recommended libedit2 libssl1.1 libclang-dev libobjc-8-dev libobjc4

2020.1/aims-desktop/aims-desktop-2020/debian/changelog

+aims-desktop (2:2020.100) buster; urgency=medium
+
+  * Change to signed-by and /usr/share/keyrings
+
+ -- Jan Groenewald <jan@aims.ac.za>  Fri, 20 Aug 2021 09:55:43 +0200
+
 aims-desktop (2:2020.99) buster; urgency=medium
 
   * Change keyserver to keyserver.ubuntu.com

2022.1/aims-desktop/aims-desktop-2022/bin/aims-install-macaulay2

 #!/bin/bash
 
-gpg --keyserver keyserver.ubuntu.com --recv-key CD9C0E09B0C780943A1AD85553F8BD99F40DCB31
-echo 'deb http://www.math.uiuc.edu/Macaulay2/Repositories/Debian bullseye main' >/etc/apt/sources.list.d/macaulay2.list
+echo 'deb [signed-by=/usr/share/keyrings/macaulay2-archive-keyring.gpg] http://www.math.uiuc.edu/Macaulay2/Repositories/Debian bullseye main' >/etc/apt/sources.list.d/macaulay2.list
+gpg --no-default-keyring --keyring /usr/share/keyrings/macaulay2-archive-keyring.gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys CD9C0E09B0C780943A1AD85553F8BD99F40DCB31
 apt-get -qq update
 apt-get -y install macaulay2
 pip3 install -t /usr/local/lib/python3.7/ macaulay2-jupyter-kernel

2022.1/aims-desktop/aims-desktop-2022/bin/aims-install-r40

 #!/bin/bash
 
-echo "deb http://cloud.r-project.org/bin/linux/debian bullseye-cran40/" > /etc/apt/sources.list.d/cran.list
-gpg --keyserver keyserver.ubuntu.com --recv-keys E19F5F87128899B192B1A2C2AD5F960A256A04AF
+echo "deb [signed-by=/usr/share/keyrings/cran-archive-keyring.gpg] http://cloud.r-project.org/bin/linux/debian bullseye-cran40/" > /etc/apt/sources.list.d/cran.list
+gpg --no-default-keyring --keyring /usr/share/keyrings/cran-archive-keyring.gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys E19F5F87128899B192B1A2C2AD5F960A256A04AF
 apt-get -qq update
 apt-get -yf install r-base r-base-dev r-recommended
 

2022.1/aims-desktop/aims-desktop-2022/bin/aims-install-rstudio

@@ -2,6 +2,9 @@
 
 RSTUDIO=https://download1.rstudio.org/desktop/bionic/amd64/rstudio-1.4.1717-amd64.deb
 
+# This key goes into root's keyring not into /usr/share/keyrings as
+# rstudio does not have a repository; we only use dpkg-sig to verify the signature
+# on the downloaded package
 gpg --keyserver keyserver.ubuntu.com --recv-keys 3F32EE77E331692F
 if [ "$1" != "-n" ]; then
 	apt-get -qq update # update unless called with -n, e.g. from aims-complete-install