From e0c5adb0543744a1e28abff5d2d9dc8a75dff7f3 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Thu, 2 Aug 2018 03:19:01 +0000
Subject: system/adelie-base: bump to 0.8.0, add utmp and catchlog users

---
 system/adelie-base/APKBUILD | 15 +++++----------
 system/adelie-base/group    |  1 +
 system/adelie-base/passwd   |  2 ++
 3 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'system')

diff --git a/system/adelie-base/APKBUILD b/system/adelie-base/APKBUILD
index d8dc2068a..770b37c13 100644
--- a/system/adelie-base/APKBUILD
+++ b/system/adelie-base/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=adelie-base
-pkgver=0.7.0
-pkgrel=3
+pkgver=0.8.0
+pkgrel=0
 pkgdesc="The Adélie Linux Base System"
 url="http://adelielinux.org/"
 arch="noarch"
@@ -36,11 +36,6 @@ build() {
 		print($1 pw ":0:::::")
 	}' "$srcdir"/passwd > "$builddir"/tree/etc/shadow
 	chmod 640 "$builddir"/tree/etc/shadow
-
-	# kill files that sometimes get in release.tar
-	rm "$builddir"/tree/dev/.dirkeep || true
-	rm "$builddir"/tree/proc/.dirkeep || true
-	rm "$builddir"/tree/sys/.dirkeep || true
 }
 
 package() {
@@ -96,8 +91,8 @@ devkit() {
 	return 0
 }
 
-sha512sums="5f4ac9c30e9066fbebc12a194c7fc7c24a35f986e195905e1914ab4809b0a795e726fa326c45309fb66eeac51f1e43ffceb5aa93f4672e2043fb042cab12457a  adelie-base-0.7.0.tar.xz
-e6775b9e1c6421338aaceee375b3b74aa100fd444e369b280ce45c9167119b76bebc11737d7f929e50e20a553a35e0e25f7d0f71deb0483d3bccc08e319dcf98  group
-9eede0c1cd56a9ffb5227cc9446cdb1bbe73d5f17cd5ee99cf29acca3160f3a96d79e1420311a140f9d9f32950b9823b33ad84dadf7b85921d4f1a945dd5a252  passwd
+sha512sums="3fc7937e8ea3ee7a0b6eb4245b8ced6ccccd42960787fabb319f314275140fb8589967dd0233a3fdbbc1553f033e367f743b9b240bda4c1b350c8424f0c017de  adelie-base-0.8.0.tar.xz
+50a2d4df4218594dd3288ac96d5336ad72318451a66540f4c86cdf31498fedf5e39ce3bfee423adbaca1ffcaf26aeaa82f17ed847bc25c0f193d2b5a5c121b97  group
+cce002394e6febc678679ca829afd5d91d26a1d5c5d3ab59f52412c75de95008c2df7e775b7539054c132a8b65160e00c5315b4b66feb27dd714259198068fd5  passwd
 a5035c18efc50be5d0c8dd452619d781da09c9441ed53462c99693170d1ae2b4306a81846e42b616c5ef8cd5b6fbbf047f93ae5ee9613126581cf701b3a6ade7  addgroup
 f50be377c781b1eefb1804ac9d96b4ebc64f80abe0d12b288413687a000e79ca30c531bbced2c63f9e4df59b1d8a71d0eda09ee82782eaafea453f2f1c2f7b8f  adduser"
diff --git a/system/adelie-base/group b/system/adelie-base/group
index 9559744d7..20b392d9d 100644
--- a/system/adelie-base/group
+++ b/system/adelie-base/group
@@ -37,6 +37,7 @@ cdrw:x:80:
 usb:x:85:
 vpopmail:x:89:
 users:x:100:games
+catchlog:x:104:
 ntp:x:123:
 nofiles:x:200:
 smmsp:x:209:smmsp
diff --git a/system/adelie-base/passwd b/system/adelie-base/passwd
index ff5fbfe73..6ecdc2b67 100644
--- a/system/adelie-base/passwd
+++ b/system/adelie-base/passwd
@@ -22,6 +22,8 @@ games:x:35:35:System Games User:/usr/games:/sbin/nologin
 postgres:x:70:70:PostgreSQL Master User:/var/lib/postgresql:/bin/sh
 cyrus:x:85:12::/usr/cyrus:/sbin/nologin
 vpopmail:x:89:89:Mail Service User:/var/vpopmail:/sbin/nologin
+utmp:x:107:406:User tracking system:/var/empty:/sbin/nologin
+catchlog:x:108:104:s6 logging system:/var/empty:/sbin/nologin
 ntp:x:123:123:NTP User:/var/empty:/sbin/nologin
 smmsp:x:209:209:smmsp:/var/spool/mqueue:/sbin/nologin
 guest:x:405:100:Guest User:/dev/null:/sbin/nologin
-- 
cgit v1.2.3-60-g2f50