From 924be496f24a65db28c1da0019379c202062c141 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Wed, 19 Oct 2022 23:45:04 +0000
Subject: [PATCH] core/filesystem to 2022.10.18-1

---
 core/filesystem/PKGBUILD | 18 ++++++++++--------
 core/filesystem/subgid   |  0
 core/filesystem/subuid   |  0
 core/filesystem/tmpfiles |  2 ++
 4 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100644 core/filesystem/subgid
 create mode 100644 core/filesystem/subuid

diff --git a/core/filesystem/PKGBUILD b/core/filesystem/PKGBUILD
index 5a3dd5d14..9e130ac64 100644
--- a/core/filesystem/PKGBUILD
+++ b/core/filesystem/PKGBUILD
@@ -5,7 +5,7 @@
 #  - modifed os-release
 
 pkgname=filesystem
-pkgver=2021.12.07
+pkgver=2022.10.18
 pkgrel=1
 pkgdesc='Base Arch Linux files'
 arch=('x86_64')
@@ -15,11 +15,11 @@ depends=('iana-etc')
 backup=('etc/crypttab' 'etc/fstab' 'etc/group' 'etc/gshadow' 'etc/host.conf'
         'etc/hosts' 'etc/issue' 'etc/ld.so.conf' 'etc/nsswitch.conf'
         'etc/passwd' 'etc/profile' 'etc/resolv.conf' 'etc/securetty'
-        'etc/shadow' 'etc/shells')
+        'etc/shadow' 'etc/shells' 'etc/subuid' 'etc/subgid')
 source=('crypttab' 'env-generator' 'fstab' 'group' 'gshadow' 'host.conf' 'hosts'
-        'issue' 'ld.so.conf' 'locale.sh' 'nsswitch.conf' 'os-release'
-        'passwd' 'profile' 'resolv.conf' 'securetty' 'shadow' 'shells' 'sysctl'
-        'sysusers' 'tmpfiles' 'archlinux-logo.svg' 'archlinux-logo.png'
+        'issue' 'ld.so.conf' 'locale.sh' 'nsswitch.conf' 'os-release' 'profile'
+        'passwd' 'resolv.conf' 'securetty' 'shadow' 'shells' 'sysctl' 'sysusers'
+        'tmpfiles' 'subuid' 'subgid' 'archlinux-logo.svg' 'archlinux-logo.png'
         'archlinux-logo-text.svg' 'archlinux-logo-text-dark.svg')
 sha256sums=('e03bede3d258d680548696623d5979c6edf03272e801a813c81ba5a5c64f4f82'
             'ed0cb4f1db4021f8c3b5ce78fdf91d2c0624708f58f36c9cf867f4d93c3bc6da'
@@ -33,15 +33,17 @@ sha256sums=('e03bede3d258d680548696623d5979c6edf03272e801a813c81ba5a5c64f4f82'
             '8ca2d8eef6fb5143c9ef7e9174ccfef59ac7ad2deee243574cd10c763156cc10'
             'c8ee7a9faf798caab178ec51afae4146f1efd8a716b7acedf28345b6c75f9697'
             '72eaedcb694aa5833e804660dfb4f61907d52aef009767173689d0bb9e845a23'
-            '5e06477834f51abf42ea4e8dc199632afc6afbfd8c44354685a271e9a48d2c0a'
             '5e4088ad8d0853d390fa303f6be8c3f69c33834200cba9e90f7849f1993ca8d0'
+            '5e06477834f51abf42ea4e8dc199632afc6afbfd8c44354685a271e9a48d2c0a'
             '5557d8e601b17a80d1ea7de78a9869be69637cb6a02fbfe334e22fdf64e61d4c'
             'd88be2b45b43605ff31dd83d6a138069b6c2e92bc8989b7b9ab9eba8da5f8c7b'
             '6e13705ac4d6f69cdba118c6b70c722346fd3c45224133e6bbfe28aca719563c'
             'c390b31fffc4a2b5d78ae8c89f5317aadef1f71baac09cfb467b675db1406d61'
             '89e43a0b7028f52d5c8e7fb961d962c4b4f4e9595880a6157274ddb2c7c0b6b4'
             'b5b28f395583d141d88c0b955cd05124f9b8cdf003feab01e55885b8e8c1303e'
-            'f17efd1c6480c5db1fdab4a0e3cfcd4baa44a3e1ae1210aebeb40f8d5c82f742'
+            '5d8e61479f0093852365090e84d8d95b1e7fccfab068274ee25863bde6ff3e07'
+            'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+            'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
             '3ffe8ea4e98db43a3ec4dcca55fd4009cd8b8d220f0996aef7a5b427fdf65234'
             '3f48779141b68a81e07fee710a42025d4f67b16240295aa4cf148a7ba99cab3c'
             '601069e6e8920309178c397fd8cebe43410827d01899d31777d13212f0dfacf8'
@@ -65,7 +67,7 @@ package() {
   # setup /etc and /usr/share/factory/etc
   install -d etc/{ld.so.conf.d,skel,profile.d} usr/share/factory/etc
   for f in fstab group host.conf hosts issue ld.so.conf nsswitch.conf \
-  passwd resolv.conf securetty shells profile; do
+  passwd resolv.conf securetty shells profile subuid subgid; do
     install -m644 "$srcdir"/$f etc/
     install -m644 "$srcdir"/$f usr/share/factory/etc/
   done
diff --git a/core/filesystem/subgid b/core/filesystem/subgid
new file mode 100644
index 000000000..e69de29bb
diff --git a/core/filesystem/subuid b/core/filesystem/subuid
new file mode 100644
index 000000000..e69de29bb
diff --git a/core/filesystem/tmpfiles b/core/filesystem/tmpfiles
index 4b5368f81..04f8d126b 100644
--- a/core/filesystem/tmpfiles
+++ b/core/filesystem/tmpfiles
@@ -14,3 +14,5 @@ C /etc/profile
 C /etc/securetty
 C /etc/shadow
 C /etc/shells
+C /etc/subuid
+C /etc/subgid