system/adelie-base: improvements, finally ship an /etc/group

3 files changed, 106 insertions, 7 deletions

diff --git a/system/adelie-base/APKBUILD b/system/adelie-base/APKBUILD
index eb5bc6650..8ac9d9f6d 100644
--- a/system/adelie-base/APKBUILD
+++ b/system/adelie-base/APKBUILD
@@ -3,26 +3,38 @@
 
 pkgname=adelie-base
 pkgver=0.3.2
-pkgrel=0
+pkgrel=1
 pkgdesc="The Adélie Linux Base System"
 url="http://adelielinux.org/"
 arch="noarch"
 license="NCSA"
-depends="apk-tools shadow sysklogd libarchive zsh binutils at coreutils diffutils fcron file findutils shimmy grep procps util-linux mailx man-db patch sed sharutils bc vim psmisc net-tools kbd less"
+depends="apk-tools shadow sysklogd libarchive-tools zsh binutils at coreutils diffutils fcron file findutils shimmy grep procps util-linux mailx man-db patch sed sharutils bc vim psmisc net-tools kbd less"
 makedepends=""
 install=""
-options="!fhs"
-subpackages="$pkgname-doc $pkgname-posix $pkgname-lsb"
-source="https://distfiles.adelielinux.org/source/$pkgname/$pkgname-$pkgver.tar.xz"
+options="!check !fhs"
+subpackages="$pkgname-doc $pkgname-posix $pkgname-lsb dev-kit:devkit"
+source="https://distfiles.adelielinux.org/source/$pkgname/$pkgname-$pkgver.tar.xz
+	group
+	passwd"
 
 build() {
-	return 0
+	# taken from Alpine Base Layout
+
+	# generate shadow
+	awk -F: '{
+		pw = ":!:"
+		if ($1 == "root") { pw = "::" }
+		print($1 pw ":0:::::")
+	}' "$srcdir"/passwd > "$builddir"/tree/etc/shadow
+	chmod 640 "$builddir"/tree/etc/shadow
 }
 
 package() {
 	cd "$builddir"
 	mkdir -p "$pkgdir"
 	make install DESTDIR="$pkgdir"
+	install -m644 "$srcdir"/group "$pkgdir"/etc/group
+	install -m644 "$srcdir"/passwd "$pkgdir"/etc/passwd
 }
 
 doc() {
@@ -35,14 +47,25 @@ doc() {
 
 posix() {
 	depends="cflow cups ed m4 ncompress pax"
+	pkgdesc="$pkgdesc - Additional POSIX tools"
 	mkdir -p "$subpkgdir"
 	return 0
 }
 
 lsb() {
 	depends="gettext gzip libarchive-tools linux-pam make mawk ncurses nspr nss"
+	pkgdesc="$pkgdesc - Additional LSB tools"
+	mkdir -p "$subpkgdir"
+	return 0
+}
+
+devkit() {
+	depends="build-tools fakeroot gzip libarchive-tools mawk xz"
+	pkgdesc="The Adélie Linux Development Kit"
 	mkdir -p "$subpkgdir"
 	return 0
 }
 
-sha512sums="bc8369dec474262de74117789db26130ffd7664f33235fad363771891ce8e64ce339f803509fc044339d8ff173dcf4b1c3cebab6fbcf4d91e3af7d2fb75580c3  adelie-base-0.3.2.tar.xz"
+sha512sums="bc8369dec474262de74117789db26130ffd7664f33235fad363771891ce8e64ce339f803509fc044339d8ff173dcf4b1c3cebab6fbcf4d91e3af7d2fb75580c3  adelie-base-0.3.2.tar.xz
+e6775b9e1c6421338aaceee375b3b74aa100fd444e369b280ce45c9167119b76bebc11737d7f929e50e20a553a35e0e25f7d0f71deb0483d3bccc08e319dcf98  group
+595d7d4ab873545b3b69b8cd028674f72d2c0b8cb4dce3fe59cf6f88e20ef5c803f4ac8e98ba93f6306f8950ef77049112cba58035adb7ae68f8ea95e9fb6610  passwd"
diff --git a/system/adelie-base/group b/system/adelie-base/group
new file mode 100644
index 000000000..9559744d7
--- /dev/null
+++ b/system/adelie-base/group
@@ -0,0 +1,48 @@
+root:x:0:root
+bin:x:1:root,bin,daemon
+daemon:x:2:root,bin,daemon
+sys:x:3:root,bin,adm
+adm:x:4:root,adm,daemon
+tty:x:5:
+disk:x:6:root,adm
+lp:x:7:lp
+mem:x:8:
+kmem:x:9:
+wheel:x:10:root
+floppy:x:11:root
+mail:x:12:mail
+news:x:13:news
+uucp:x:14:uucp
+man:x:15:man
+cron:x:16:cron
+console:x:17:
+audio:x:18:
+cdrom:x:19:
+dialout:x:20:root
+ftp:x:21:
+sshd:x:22:
+input:x:23:
+at:x:25:at
+tape:x:26:root
+video:x:27:root
+netdev:x:28:
+readproc:x:30:
+squid:x:31:squid
+xfs:x:33:xfs
+kvm:x:34:kvm
+games:x:35:
+shadow:x:42:
+postgres:x:70:
+cdrw:x:80:
+usb:x:85:
+vpopmail:x:89:
+users:x:100:games
+ntp:x:123:
+nofiles:x:200:
+smmsp:x:209:smmsp
+locate:x:245:
+abuild:x:300:
+utmp:x:406:
+ping:x:999:
+nogroup:x:65533:
+nobody:x:65534:
diff --git a/system/adelie-base/passwd b/system/adelie-base/passwd
new file mode 100644
index 000000000..ca90c2f83
--- /dev/null
+++ b/system/adelie-base/passwd
@@ -0,0 +1,28 @@
+root:x:0:0:Root User:/root:/bin/ash
+bin:x:1:1:System Binary User:/bin:/sbin/nologin
+daemon:x:2:2:System Daemon User:/sbin:/sbin/nologin
+adm:x:3:4:adm:/var/adm:/sbin/nologin
+lp:x:4:7:System Printer User:/var/spool/lpd:/sbin/nologin
+sync:x:5:0:System Sync User:/sbin:/bin/sync
+shutdown:x:6:0:System Shutdown User:/sbin:/sbin/shutdown
+halt:x:7:0:System Halt User:/sbin:/sbin/halt
+mail:x:8:12:Mailer Daemon User:/var/spool/mail:/sbin/nologin
+news:x:9:13:Newsgroup Service User:/usr/lib/news:/sbin/nologin
+uucp:x:10:14:System UUCP User:/var/spool/uucppublic:/sbin/nologin
+operator:x:11:0:System Operator:/root:/bin/sh
+man:x:13:15:System Documentation User:/usr/man:/sbin/nologin
+postmaster:x:14:12:System Postmaster:/var/spool/mail:/sbin/nologin
+cron:x:16:16:System cron User:/var/spool/cron:/sbin/nologin
+ftp:x:21:21:FTP Daemon User:/var/lib/ftp:/sbin/nologin
+sshd:x:22:22:sshd:/dev/null:/sbin/nologin
+at:x:25:25:at:/var/spool/cron/atjobs:/sbin/nologin
+squid:x:31:31:Squid:/var/cache/squid:/sbin/nologin
+xfs:x:33:33:X Font Server User:/etc/X11/fs:/sbin/nologin
+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
+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
+nobody:x:65534:65534:Unprivileged System User:/:/sbin/nologin