Merge branch 'master' into mod-package-arch

Dockerfile

@@ -44,6 +44,7 @@ RUN \
   mkdir -m 0555 -p \
     /root-out/{sys,proc} && \
   pacman -r /root-out -Sy --noconfirm \
+    archlinux-keyring \
     bash \
     coreutils \
     findutils \

Dockerfile.aarch64

@@ -18,7 +18,17 @@ RUN \
   mkdir /root-out && \
   tar xf \
     /rootfs.tar.xz -C \
-    /root-out
+    /root-out && \
+  mkdir -p /root-out/usr/share/pacman/keyrings/ && \
+  curl -o \
+    /root-out/usr/share/pacman/keyrings/archlinuxarm.gpg -L \
+    https://raw.githubusercontent.com/archlinuxarm/archlinuxarm-keyring/master/archlinuxarm.gpg && \
+  curl -o \
+    /root-out/usr/share/pacman/keyrings/archlinuxarm-revoked -L \
+    https://raw.githubusercontent.com/archlinuxarm/archlinuxarm-keyring/master/archlinuxarm-revoked && \
+  curl -o \
+    /root-out/usr/share/pacman/keyrings/archlinuxarm-trusted -L \
+    https://raw.githubusercontent.com/archlinuxarm/archlinuxarm-keyring/master/archlinuxarm-trusted
 
 # pacstrap stage
 FROM scratch as pacstrap-stage
@@ -35,6 +45,7 @@ RUN \
   pacman-key --init && \
   pacman-key --populate archlinuxarm && \
   pacman -r /root-out -Sy --noconfirm \
+    archlinuxarm-keyring \
     bash \
     coreutils \
     findutils \

Dockerfile.armhf

@@ -18,7 +18,17 @@ RUN \
   mkdir /root-out && \
   tar xf \
     /rootfs.tar.xz -C \
-    /root-out
+    /root-out && \
+  mkdir -p /root-out/usr/share/pacman/keyrings/ && \
+  curl -o \
+    /root-out/usr/share/pacman/keyrings/archlinuxarm.gpg -L \
+    https://raw.githubusercontent.com/archlinuxarm/archlinuxarm-keyring/master/archlinuxarm.gpg && \
+  curl -o \
+    /root-out/usr/share/pacman/keyrings/archlinuxarm-revoked -L \
+    https://raw.githubusercontent.com/archlinuxarm/archlinuxarm-keyring/master/archlinuxarm-revoked && \
+  curl -o \
+    /root-out/usr/share/pacman/keyrings/archlinuxarm-trusted -L \
+    https://raw.githubusercontent.com/archlinuxarm/archlinuxarm-keyring/master/archlinuxarm-trusted
 
 # pacstrap stage
 FROM scratch as pacstrap-stage
@@ -35,6 +45,7 @@ RUN \
   pacman-key --init && \
   pacman-key --populate archlinuxarm && \
   pacman -r /root-out -Sy --noconfirm \
+    archlinuxarm-keyring \
     bash \
     coreutils \
     findutils \

package_versions.txt

@@ -1,5 +1,5 @@
 acl 2.3.1-2
-archlinux-keyring 20220713-1
+archlinux-keyring 20220727-1
 attr 2.5.1-2
 audit 3.0.8-1
 bash 5.1.016-1
@@ -16,22 +16,24 @@ file 5.42-1
 filesystem 2021.12.07-1
 findutils 4.9.0-1
 gawk 5.1.1-1
-gcc-libs 12.1.0-3
+gcc-libs 12.1.1-4
 gdbm 1.23-1
+gettext 0.21-2
 glib2 2.72.3-1
-glibc 2.35-6
+glibc 2.36-1
 gmp 6.2.1-2
 gnupg 2.2.36-1
-gnutls 3.7.6-1
+gnutls 3.7.7-1
 gpgme 1.17.1-1
 grep 3.7-1
 gzip 1.12-1
 iana-etc 20220603-1
+icu 71.1-1
 json-c 0.16-1
 keyutils 1.6.3-1
 krb5 1.19.3-3
 less 1:590-1
-libarchive 3.6.1-1
+libarchive 3.6.1-2
 libassuan 2.5.5-1
 libcap 2.65-1
 libcap-ng 0.8.3-1
@@ -49,21 +51,22 @@ libsasl 2.1.28-1
 libseccomp 2.5.4-1
 libsecret 0.20.5-2
 libssh2 1.10.0-1
-libsysprof-capture 3.44.0-1
+libsysprof-capture 3.44.0-2
 libtasn1 4.18.0-1
 libtirpc 1.3.2-1
 libunistring 1.0-1
 libverto 0.3.2-4
 libxcrypt 4.4.28-2
-linux-api-headers 5.17.5-2
+libxml2 2.9.14-1
+linux-api-headers 5.18.15-1
 lz4 1:1.9.3-2
-mpfr 4.1.0.p13-2
+mpfr 4.1.0.p13-3
 ncurses 6.3-3
-nettle 3.8-1
+nettle 3.8.1-1
 npth 1.6-3
 openssl 1.1.1.q-1
 p11-kit 0.24.1-1
-pacman 6.0.1-5
+pacman 6.0.1-7
 pacman-mirrorlist 20220724-1
 pam 1.5.2-1
 pambase 20211210-1
@@ -74,13 +77,13 @@ procps-ng 3.3.17-1
 readline 8.1.002-1
 sed 4.8-1
 shadow 4.11.1-1
-sqlite 3.39.1-1
+sqlite 3.39.2-1
 systemd-libs 251.3-1
 tar 1.34-1
 tpm2-tss 3.2.0-1
 tzdata 2022a-1
-util-linux 2.38-1
-util-linux-libs 2.38-1
+util-linux 2.38.1-1
+util-linux-libs 2.38.1-1
 which 2.21-5
 xz 5.2.5-3
 zlib 1:1.2.12-2