[filesystem]: upgrade to v2023.01.31

14 files changed, 44 insertions, 28 deletions

diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index ba23f7d73..34c4b9704 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -10,7 +10,7 @@
 
 
 pkgname=filesystem
-pkgver=2021.12.07
+pkgver=2023.01.31
 pkgrel=1
 pkgrel+=.parabola1
 pkgdesc='Base Parabola GNU/Linux-libre files'
@@ -22,16 +22,17 @@ 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')
 backup+=('etc/motd')
 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')
 source=( ${source[*]//archlinux-logo/parabola-logo} )
 source+=('motd')
 source+=('disable-dotnet-telemetry.sh')
+# NOTE: the commented files below, are those which should differ from arch
 sha256sums=('e03bede3d258d680548696623d5979c6edf03272e801a813c81ba5a5c64f4f82'
             'ed0cb4f1db4021f8c3b5ce78fdf91d2c0624708f58f36c9cf867f4d93c3bc6da'
             'e54626e74ed8fee4173b62a545ab1c3a3a069e4217a0ee8fc398d9933e9c1696'
@@ -43,16 +44,18 @@ sha256sums=('e03bede3d258d680548696623d5979c6edf03272e801a813c81ba5a5c64f4f82'
             'dad04a370e488aa85fb0a813a5c83cf6fd981ce01883fc59685447b092de84b5'
             '8ca2d8eef6fb5143c9ef7e9174ccfef59ac7ad2deee243574cd10c763156cc10'
             'c8ee7a9faf798caab178ec51afae4146f1efd8a716b7acedf28345b6c75f9697'
-            'af2eee47719566740b750f0806e897a8439656df4a7476bb6e71465fd075b45d'   # os-release
-            '5e06477834f51abf42ea4e8dc199632afc6afbfd8c44354685a271e9a48d2c0a'
+            'eec7e0a947d6a40d18a30543b9170f3f329ab0948b269800f9f3a4cff858cc7c'   # os-release
             '5e4088ad8d0853d390fa303f6be8c3f69c33834200cba9e90f7849f1993ca8d0'
+            '5e06477834f51abf42ea4e8dc199632afc6afbfd8c44354685a271e9a48d2c0a'
             '5557d8e601b17a80d1ea7de78a9869be69637cb6a02fbfe334e22fdf64e61d4c'
             'd88be2b45b43605ff31dd83d6a138069b6c2e92bc8989b7b9ab9eba8da5f8c7b'
             '6e13705ac4d6f69cdba118c6b70c722346fd3c45224133e6bbfe28aca719563c'
-            'c390b31fffc4a2b5d78ae8c89f5317aadef1f71baac09cfb467b675db1406d61'
+            '0d9ad0a063e74e6b88db52b2f0a93e7b8f6faf1395981edebac493a13d0b59b3'
             '89e43a0b7028f52d5c8e7fb961d962c4b4f4e9595880a6157274ddb2c7c0b6b4'
-            '04dd4cbe5078f5181176ade3a82f333e3f48091b118360d69cc45a3526503818'   # sysusers
-            'f17efd1c6480c5db1fdab4a0e3cfcd4baa44a3e1ae1210aebeb40f8d5c82f742'
+            '59877ca8c00192776d06d0c11087083e31e5c5ba6830c4faaa924d858df42f8a'   # sysusers
+            '5d8e61479f0093852365090e84d8d95b1e7fccfab068274ee25863bde6ff3e07'
+            'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+            'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
             'd5f0a4f75761afd5ebbc6970ac9aba5be3c28bb660adf7118353a0e018911e68'   # parabola-logo.svg
             'c6486f4c9456fa62a75727adfcc8f2403a1a9fac29386f942c0678c109cc72e8'   # parabola-logo.png
             '09838fea00c5ceff6e7ed28bb1b6d62feb1e2471df9fe5a4328071ecb9e837f3'   # parabola-logo-text.svg
@@ -86,7 +89,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/libre/filesystem/os-release b/libre/filesystem/os-release
index 49c4357f6..8dd44ad61 100644
--- a/libre/filesystem/os-release
+++ b/libre/filesystem/os-release
@@ -10,4 +10,4 @@ HOME_URL="https://www.parabola.nu/"
 DOCUMENTATION_URL="https://wiki.parabola.nu/"
 SUPPORT_URL="ircs://irc.libera.chat/#parabola"
 BUG_REPORT_URL="https://labs.parabola.nu/"
-LOGO=parabola
+LOGO=parabola-logo
diff --git a/libre/filesystem/shells b/libre/filesystem/shells
index 19324ea83..e7d0fb85d 100644
--- a/libre/filesystem/shells
+++ b/libre/filesystem/shells
@@ -3,3 +3,4 @@
 
 /bin/sh
 /bin/bash
+/bin/rbash
diff --git a/libre/filesystem/subgid b/libre/filesystem/subgid
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/libre/filesystem/subgid
diff --git a/libre/filesystem/subuid b/libre/filesystem/subuid
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/libre/filesystem/subuid
diff --git a/libre/filesystem/sysusers b/libre/filesystem/sysusers
index 432df2771..2f674cc34 100644
--- a/libre/filesystem/sysusers
+++ b/libre/filesystem/sysusers
@@ -1,5 +1,6 @@
 # default parabola groups
 # groups first, because we have user/group id mismatch on ftp and mail
+g root 0 - -
 g sys 3 - -
 g mem 8 - -
 g ftp 11 - -
@@ -22,6 +23,7 @@ u ftp 14 - /srv/ftp
 u http 33 - /srv/http
 
 # default membership
+m root root
 m bin daemon
 m bin sys
 m daemon adm
diff --git a/libre/filesystem/tmpfiles b/libre/filesystem/tmpfiles
index 4b5368f81..04f8d126b 100644
--- a/libre/filesystem/tmpfiles
+++ b/libre/filesystem/tmpfiles
@@ -14,3 +14,5 @@ C /etc/profile
 C /etc/securetty
 C /etc/shadow
 C /etc/shells
+C /etc/subuid
+C /etc/subgid
diff --git a/nonsystemd/filesystem/PKGBUILD b/nonsystemd/filesystem/PKGBUILD
index 683056b0c..a36377bdb 100644
--- a/nonsystemd/filesystem/PKGBUILD
+++ b/nonsystemd/filesystem/PKGBUILD
@@ -8,11 +8,11 @@
 
 # parabola changes and rationale:
 #  - parabola branding (os-release,motd,icon,logo)
-#  - systemd-specific 'env-generator' is not used for nonsystemd
+#  - non-systemd-tweaks (env-generator, nsswitch.conf)
 
 
 pkgname=filesystem
-pkgver=2021.12.07
+pkgver=2023.01.31
 pkgrel=1
 pkgrel+=.parabola1
 pkgrel+=.nonsystemd1
@@ -25,19 +25,20 @@ 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')
 backup+=('etc/motd')
 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')
 source=( ${source[*]/env-generator/}                )
 source=( ${source[*]//archlinux-logo/parabola-logo} )
 source+=('motd')
 source+=('disable-dotnet-telemetry.sh')
+# NOTE: the commented files below, are those which should differ from arch
 sha256sums=('e03bede3d258d680548696623d5979c6edf03272e801a813c81ba5a5c64f4f82'
-            # (env-generator is not used for nonsystemd)
+                                                                                # env-generator (not for nonsystemd)
             'e54626e74ed8fee4173b62a545ab1c3a3a069e4217a0ee8fc398d9933e9c1696'
             '244f0718ee2a9d6862ae59d6c18c1dd1568651eada91a704574fa527fbac2b3a'
             '90d879374f77bac47f132164c1e7fc4892e994ff1d1ac376efa0c1c26ea37273'
@@ -46,17 +47,19 @@ sha256sums=('e03bede3d258d680548696623d5979c6edf03272e801a813c81ba5a5c64f4f82'
             '8b8f24af3454e87b4e316b4978d0de7958a98cc44606aa801d9696d2c21f4385'   # issue
             'dad04a370e488aa85fb0a813a5c83cf6fd981ce01883fc59685447b092de84b5'
             '8ca2d8eef6fb5143c9ef7e9174ccfef59ac7ad2deee243574cd10c763156cc10'
-            'aa4dc5b2374fb32863e3bc1ce20a2de2d34fe4eed1cd63c599bc82fab21463cc'   # nsswitch.conf
-            'af2eee47719566740b750f0806e897a8439656df4a7476bb6e71465fd075b45d'   # os-release
-            '5e06477834f51abf42ea4e8dc199632afc6afbfd8c44354685a271e9a48d2c0a'
+            'aa4dc5b2374fb32863e3bc1ce20a2de2d34fe4eed1cd63c599bc82fab21463cc'   # nsswitch.conf (should differ from libre also)
+            'eec7e0a947d6a40d18a30543b9170f3f329ab0948b269800f9f3a4cff858cc7c'   # os-release
             '5e4088ad8d0853d390fa303f6be8c3f69c33834200cba9e90f7849f1993ca8d0'
+            '5e06477834f51abf42ea4e8dc199632afc6afbfd8c44354685a271e9a48d2c0a'
             '5557d8e601b17a80d1ea7de78a9869be69637cb6a02fbfe334e22fdf64e61d4c'
             'd88be2b45b43605ff31dd83d6a138069b6c2e92bc8989b7b9ab9eba8da5f8c7b'
             '6e13705ac4d6f69cdba118c6b70c722346fd3c45224133e6bbfe28aca719563c'
-            'c390b31fffc4a2b5d78ae8c89f5317aadef1f71baac09cfb467b675db1406d61'
+            '0d9ad0a063e74e6b88db52b2f0a93e7b8f6faf1395981edebac493a13d0b59b3'
             '89e43a0b7028f52d5c8e7fb961d962c4b4f4e9595880a6157274ddb2c7c0b6b4'
-            '04dd4cbe5078f5181176ade3a82f333e3f48091b118360d69cc45a3526503818'   # sysusers
-            'f17efd1c6480c5db1fdab4a0e3cfcd4baa44a3e1ae1210aebeb40f8d5c82f742'
+            '59877ca8c00192776d06d0c11087083e31e5c5ba6830c4faaa924d858df42f8a'   # sysusers
+            '5d8e61479f0093852365090e84d8d95b1e7fccfab068274ee25863bde6ff3e07'
+            'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
+            'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
             'd5f0a4f75761afd5ebbc6970ac9aba5be3c28bb660adf7118353a0e018911e68'   # parabola-logo.svg
             'c6486f4c9456fa62a75727adfcc8f2403a1a9fac29386f942c0678c109cc72e8'   # parabola-logo.png
             '09838fea00c5ceff6e7ed28bb1b6d62feb1e2471df9fe5a4328071ecb9e837f3'   # parabola-logo-text.svg
@@ -90,7 +93,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/nonsystemd/filesystem/os-release b/nonsystemd/filesystem/os-release
index 60b0adc05..8dd44ad61 100644
--- a/nonsystemd/filesystem/os-release
+++ b/nonsystemd/filesystem/os-release
@@ -8,6 +8,6 @@ VARIANT_ID="@VARIANT_ID@"
 ANSI_COLOR="1;35"
 HOME_URL="https://www.parabola.nu/"
 DOCUMENTATION_URL="https://wiki.parabola.nu/"
-SUPPORT_URL="irc://irc.libera.chat/#parabola"
+SUPPORT_URL="ircs://irc.libera.chat/#parabola"
 BUG_REPORT_URL="https://labs.parabola.nu/"
-LOGO=parabola
+LOGO=parabola-logo
diff --git a/nonsystemd/filesystem/shells b/nonsystemd/filesystem/shells
index 19324ea83..e7d0fb85d 100644
--- a/nonsystemd/filesystem/shells
+++ b/nonsystemd/filesystem/shells
@@ -3,3 +3,4 @@
 
 /bin/sh
 /bin/bash
+/bin/rbash
diff --git a/nonsystemd/filesystem/subgid b/nonsystemd/filesystem/subgid
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/nonsystemd/filesystem/subgid
diff --git a/nonsystemd/filesystem/subuid b/nonsystemd/filesystem/subuid
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/nonsystemd/filesystem/subuid
diff --git a/nonsystemd/filesystem/sysusers b/nonsystemd/filesystem/sysusers
index 432df2771..2f674cc34 100644
--- a/nonsystemd/filesystem/sysusers
+++ b/nonsystemd/filesystem/sysusers
@@ -1,5 +1,6 @@
 # default parabola groups
 # groups first, because we have user/group id mismatch on ftp and mail
+g root 0 - -
 g sys 3 - -
 g mem 8 - -
 g ftp 11 - -
@@ -22,6 +23,7 @@ u ftp 14 - /srv/ftp
 u http 33 - /srv/http
 
 # default membership
+m root root
 m bin daemon
 m bin sys
 m daemon adm
diff --git a/nonsystemd/filesystem/tmpfiles b/nonsystemd/filesystem/tmpfiles
index 4b5368f81..04f8d126b 100644
--- a/nonsystemd/filesystem/tmpfiles
+++ b/nonsystemd/filesystem/tmpfiles
@@ -14,3 +14,5 @@ C /etc/profile
 C /etc/securetty
 C /etc/shadow
 C /etc/shells
+C /etc/subuid
+C /etc/subgid