From e22e526a2d7efbac49e6149d744d0899ca64d771 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Mon, 30 May 2016 11:00:20 -0300
Subject: [PATCH] Remove passwd, master.passwd and group files

These files don't need to be present on pfSense main repo, they are
updated according our needs during first boot so we can use standard
file from FreeBSD

While here, do not try to run pwd_mkdb since it's already done by make
distribution
---
 src/etc/group           | 31 -------------------------------
 src/etc/master.passwd   | 29 -----------------------------
 src/etc/passwd          | 26 --------------------------
 tools/builder_common.sh |  3 ---
 4 files changed, 89 deletions(-)
 delete mode 100644 src/etc/group
 delete mode 100644 src/etc/master.passwd
 delete mode 100644 src/etc/passwd

diff --git a/src/etc/group b/src/etc/group
deleted file mode 100644
index a0ca8cebf4..0000000000
--- a/src/etc/group
+++ /dev/null
@@ -1,31 +0,0 @@
-wheel:*:0:root,admin
-daemon:*:1:daemon
-kmem:*:2:root
-sys:*:3:root
-tty:*:4:root
-operator:*:5:root
-mail:*:6:
-bin:*:7:
-news:*:8:
-man:*:9:
-games:*:13:
-staff:*:20:root
-sshd:*:22:
-smmsp:*:25:
-mailnull:*:26:
-guest:*:31:root
-bind:*:53:
-unbound:*:59:
-proxy:*:62:
-_pflogd:*:64:
-_dhcp:*:65:
-authpf:*:63:
-uucp:*:66:
-dialer:*:68:
-network:*:69:
-www:*:80:
-nogroup:*:65533:
-nobody:*:65534:
-audit:*:77:
-_ntp:*:123:
-_relayd:*:913:
diff --git a/src/etc/master.passwd b/src/etc/master.passwd
deleted file mode 100644
index c2cc461e11..0000000000
--- a/src/etc/master.passwd
+++ /dev/null
@@ -1,29 +0,0 @@
-# $FreeBSD: src/etc/master.passwd,v 1.39 2004/08/01 21:33:47 markm Exp $
-#
-root:$2b$10$13u6qwCOwODv34GyCMgdWub6oQF3RX0rG7c3d3X4JvzuEmAXLYDd2:0:0::0:0:Charlie &:/root:/bin/sh
-toor:*:0:0::0:0:Bourne-again Superuser:/root:
-daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin
-operator:*:2:5::0:0:System &:/:/usr/sbin/nologin
-bin:*:3:7::0:0:Binaries Commands and Source:/:/usr/sbin/nologin
-tty:*:4:65533::0:0:Tty Sandbox:/:/usr/sbin/nologin
-kmem:*:5:65533::0:0:KMem Sandbox:/:/usr/sbin/nologin
-games:*:7:13::0:0:Games pseudo-user:/usr/games:/usr/sbin/nologin
-news:*:8:8::0:0:News Subsystem:/:/usr/sbin/nologin
-man:*:9:9::0:0:Mister Man Pages:/usr/share/man:/usr/sbin/nologin
-sshd:*:22:22::0:0:Secure Shell Daemon:/var/empty:/usr/sbin/nologin
-smmsp:*:25:25::0:0:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin
-mailnull:*:26:26::0:0:Sendmail Default User:/var/spool/mqueue:/usr/sbin/nologin
-bind:*:53:53::0:0:Bind Sandbox:/:/usr/sbin/nologin
-unbound:*:59:59::0:0:Unbound DNS Resolver:/var/unbound:/usr/sbin/nologin
-proxy:*:62:62::0:0:Packet Filter pseudo-user:/nonexistent:/usr/sbin/nologin
-_pflogd:*:64:64::0:0:pflogd privsep user:/var/empty:/usr/sbin/nologin
-www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/usr/sbin/nologin
-nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin
-dhcpd:*:1002:1002::0:0:DHCP Daemon:/nonexistent:/sbin/nologin
-admin:$2b$10$13u6qwCOwODv34GyCMgdWub6oQF3RX0rG7c3d3X4JvzuEmAXLYDd2:0:0::0:0:Admin User:/root:/bin/sh
-_dhcp:*:65:65::0:0:dhcp programs:/var/empty:/usr/sbin/nologin
-_isakmpd:*:68:68::0:0:isakmpd privsep:/var/empty:/sbin/nologin
-uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/local/libexec/uucp/uucico
-pop:*:68:6::0:0:Post Office Owner:/nonexistent:/usr/sbin/nologin
-_ntp:*:123:123::0:0:NTP daemon:/var/empty:/sbin/nologin
-_relayd:*:913:913::0:0:Relay Daemon:/var/empty:/usr/sbin/nologin
diff --git a/src/etc/passwd b/src/etc/passwd
deleted file mode 100644
index 040f3e5358..0000000000
--- a/src/etc/passwd
+++ /dev/null
@@ -1,26 +0,0 @@
-root:*:0:0:Charlie &:/root:/bin/sh
-toor:*:0:0:Bourne-again Superuser:/root:
-daemon:*:1:1:Owner of many system processes:/root:/usr/sbin/nologin
-operator:*:2:5:System &:/:/usr/sbin/nologin
-bin:*:3:7:Binaries Commands and Source:/:/usr/sbin/nologin
-tty:*:4:65533:Tty Sandbox:/:/usr/sbin/nologin
-kmem:*:5:65533:KMem Sandbox:/:/usr/sbin/nologin
-games:*:7:13:Games pseudo-user:/usr/games:/usr/sbin/nologin
-news:*:8:8:News Subsystem:/:/usr/sbin/nologin
-man:*:9:9:Mister Man Pages:/usr/share/man:/usr/sbin/nologin
-sshd:*:22:22:Secure Shell Daemon:/var/empty:/usr/sbin/nologin
-smmsp:*:25:25:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin
-mailnull:*:26:26:Sendmail Default User:/var/spool/mqueue:/usr/sbin/nologin
-bind:*:53:53:Bind Sandbox:/:/usr/sbin/nologin
-unbound:*:59:59:Unbound DNS Resolver:/var/unbound:/usr/sbin/nologin
-proxy:*:62:62:Packet Filter pseudo-user:/nonexistent:/usr/sbin/nologin
-_pflogd:*:64:64:pflogd privsep user:/var/empty:/usr/sbin/nologin
-uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/local/libexec/uucp/uucico
-pop:*:68:6::0:0:Post Office Owner:/nonexistent:/usr/sbin/nologin
-www:*:80:80:World Wide Web Owner:/nonexistent:/usr/sbin/nologin
-nobody:*:65534:65534:Unprivileged user:/nonexistent:/usr/sbin/nologin
-distcc:*:1001:1001:Distcc:/home/distcc:/sbin/nologin
-dhcpd:*:1002:1002:DHCP Daemon:/nonexistent:/sbin/nologin
-admin:*:0:0:Admin User:/home/admin:/bin/sh
-_ntp:*:123:123:NTP daemon:/var/empty:/sbin/nologin
-_relayd:*:913:913:Relay Daemon:/var/empty:/usr/sbin/nologin
diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index cab3b99bed..14dd9860a6 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -1033,9 +1033,6 @@ clone_to_staging_area() {
 			${STAGE_CHROOT_DIR}/usr/local/sbin/${PRODUCT_NAME}-upgrade
 	fi
 
-	if [ -f ${STAGE_CHROOT_DIR}/etc/master.passwd ]; then
-		chroot ${STAGE_CHROOT_DIR} pwd_mkdb /etc/master.passwd
-	fi
 	mkdir -p ${STAGE_CHROOT_DIR}/etc/mtree
 	mtree -Pcp ${STAGE_CHROOT_DIR}/var > ${STAGE_CHROOT_DIR}/etc/mtree/var.dist
 	mtree -Pcp ${STAGE_CHROOT_DIR}/etc > ${STAGE_CHROOT_DIR}/etc/mtree/etc.dist