[arch-commits] Commit in filesystem/trunk (6 files)

[Sébastien Luttringer]

    Date: Monday, September 11, 2017 @ 23:56:58
  Author: seblu
Revision: 305366

Various fixes

- use uid/gid in PKGBUILD to avoid dependency to itself
- add nobody as a static user (FS#55589)
- add headers to passwd,shadow,group,gshadow
- sort deps and backup alphabetically

Modified:
  filesystem/trunk/PKGBUILD
  filesystem/trunk/group
  filesystem/trunk/gshadow
  filesystem/trunk/os-release
  filesystem/trunk/passwd
  filesystem/trunk/shadow

------------+
 PKGBUILD   |   55 ++++++++++++++++++++++++++++---------------------------
 group      |    3 +++
 gshadow    |    3 +++
 os-release |    1 -
 passwd     |    3 +++
 shadow     |    3 +++
 6 files changed, 40 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-09-11 23:49:07 UTC (rev 305365)
+++ PKGBUILD	2017-09-11 23:56:58 UTC (rev 305366)
@@ -4,7 +4,7 @@
 
 pkgname=filesystem
 pkgver=2017.09
-pkgrel=3
+pkgrel=3.1
 pkgdesc='Base Arch Linux files'
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -11,35 +11,35 @@
 url='https://www.archlinux.org'
 groups=('base')
 depends=('iana-etc')
-backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf'
-        'etc/passwd' 'etc/shadow' 'etc/gshadow' 'etc/resolv.conf' 'etc/motd'
-        'etc/nsswitch.conf' 'etc/shells' 'etc/host.conf' 'etc/securetty'
-        'etc/profile' 'etc/issue')
-source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf'
-        'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'os-release'
-        'resolv.conf' 'shells' 'gshadow' 'profile' 'locale.sh' 'sysusers'
-        'tmpfiles' 'env-generator')
-md5sums=('7fed1e1fb855e41a6d64d41f8521d69a'
+backup=('etc/crypttab' 'etc/fstab' 'etc/group' 'etc/gshadow' 'etc/host.conf'
+        'etc/hosts' 'etc/issue' 'etc/ld.so.conf' 'etc/motd' 'etc/nsswitch.conf'
+        'etc/passwd' 'etc/profile' 'etc/resolv.conf' 'etc/securetty'
+        'etc/shadow' 'etc/shells')
+source=('crypttab' 'env-generator' 'fstab' 'group' 'gshadow' 'host.conf' 'hosts'
+        'issue' 'ld.so.conf' 'locale.sh' 'motd' 'nsswitch.conf' 'os-release'
+        'passwd' 'profile' 'resolv.conf' 'securetty' 'shadow' 'shells'
+        'sysusers' 'tmpfiles')
+md5sums=('5fa6674df7645d7f5895f2d12b4ef4e9'
+         '2b0344e9639f35f3c0d5637a23556089'
+         'e33f6dfdd61978fcb3ddf1431286e05a'
+         '210aa72839c2d05c81c29c4b7f9d4c1e'
+         'de6c96bb49ebdf1b4c073faf8c73dd72'
+         '7d119a9cce152aa182fb3392ddeecea7'
+         'a1315ea3e2b64d197b6efaf9c14ff778'
          '7813c481156f6b280a3ba91fc6236368'
-         '44851ecc062ba34a4c024b6f3246c48f'
-         'f04bcb2803afc4dcb95670fe87343b4d'
-         '7d119a9cce152aa182fb3392ddeecea7'
          '5deb9f890a4d08a245e9752ede77271e'
-         '5182ac38a0de85da8ade93ef71975ca4'
-         'f64466dd77c7bec37a8b47681468211a'
-         'e33f6dfdd61978fcb3ddf1431286e05a'
-         '5fa6674df7645d7f5895f2d12b4ef4e9'
-         'a1315ea3e2b64d197b6efaf9c14ff778'
+         '71ed98c52e11ada1f936ac8cb14eecd9'
          'd41d8cd98f00b204e9800998ecf8427e'
-         '7756fd3b8876eee095bd6e94ddac13ca'
+         '44851ecc062ba34a4c024b6f3246c48f'
+         '0a0fbb8e64faabb40023bd180d7190a1'
+         '760c1bfce90117f866406ead94360458'
+         '13feaea89d404729ad2f7cf0bcc41d85'
          '0ee015fad07732676d9488ae498eed41'
+         'f04bcb2803afc4dcb95670fe87343b4d'
+         'db631dab91552a497d4f6c7b0f73ee0e'
          'a78cd8d7f8240a8448edee82f503c34e'
-         '1c1e3b08acfa286f4b417c49de3e4366'
-         '13feaea89d404729ad2f7cf0bcc41d85'
-         '71ed98c52e11ada1f936ac8cb14eecd9'
          '6ec767b80e0df5c4450078363a31bca0'
-         '0267a3a463f35eec8a31f40a720dfd86'
-         '2b0344e9639f35f3c0d5637a23556089')
+         '0267a3a463f35eec8a31f40a720dfd86')
 
 package() {
   cd "$pkgdir"
@@ -53,7 +53,8 @@
   install -d -m0750 root
   install -d -m1777 tmp
   # vsftpd won't run with write perms on /srv/ftp
-  install -d -m555 -g ftp srv/ftp
+  # ftp (uid 14/gid 11)
+  install -d -m555 -g 11 srv/ftp
 
   # setup /etc and /usr/share/factory/etc
   install -d etc/{ld.so.conf.d,skel,profile.d} usr/share/factory/etc
@@ -76,8 +77,8 @@
   done
   install -d -m1777 var/{tmp,spool/mail}
 
-  # allow setgid games to write scores
-  install -d -m775 -g games var/games
+  # allow setgid games (gid 50) to write scores
+  install -d -m775 -g 50 var/games
   ln -s spool/mail var/mail
   ln -s ../run var/run
   ln -s ../run/lock var/lock

Modified: group
===================================================================
--- group	2017-09-11 23:49:07 UTC (rev 305365)
+++ group	2017-09-11 23:56:58 UTC (rev 305366)
@@ -1 +1,4 @@
+# User group file.
+# See group(5) for details.
 root:x:0:root
+nobody:x:99:

Modified: gshadow
===================================================================
--- gshadow	2017-09-11 23:49:07 UTC (rev 305365)
+++ gshadow	2017-09-11 23:56:58 UTC (rev 305366)
@@ -1 +1,4 @@
+# Shadowed group file.
+# See gshadow(5) for details.
 root:::root
+nobody:::

Modified: os-release
===================================================================
--- os-release	2017-09-11 23:49:07 UTC (rev 305365)
+++ os-release	2017-09-11 23:56:58 UTC (rev 305366)
@@ -6,4 +6,3 @@
 HOME_URL="https://www.archlinux.org/"
 SUPPORT_URL="https://bbs.archlinux.org/"
 BUG_REPORT_URL="https://bugs.archlinux.org/"
-

Modified: passwd
===================================================================
--- passwd	2017-09-11 23:49:07 UTC (rev 305365)
+++ passwd	2017-09-11 23:56:58 UTC (rev 305366)
@@ -1 +1,4 @@
+# The password file.
+# See passwd(5) for details.
 root:x:0:0::/root:/bin/bash
+nobody:x:99:99::/:/usr/bin/nologin

Modified: shadow
===================================================================
--- shadow	2017-09-11 23:49:07 UTC (rev 305365)
+++ shadow	2017-09-11 23:56:58 UTC (rev 305366)
@@ -1 +1,4 @@
+# Shadowed password file.
+# See shadow(5) for details.
 root::14871::::::
+nobody:x:14871::::::