Create /etc/{passwd,pwd.db,spwd.db} from /etc/master.passwd

if any do not exist, #152856.
Package-Manager: portage-2.1.2_pre3-r9

3 files changed, 27 insertions, 20 deletions

diff --git a/sys-freebsd/freebsd-usbin/ChangeLog b/sys-freebsd/freebsd-usbin/ChangeLog
index a71a47540cb2..c044b62503d9 100644
--- a/sys-freebsd/freebsd-usbin/ChangeLog
+++ b/sys-freebsd/freebsd-usbin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-freebsd/freebsd-usbin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.27 2006/10/19 04:46:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/ChangeLog,v 1.28 2006/10/26 11:45:45 uberlord Exp $
+
+  26 Oct 2006; Roy Marples <uberlord@gentoo.org>
+  freebsd-usbin-6.2_beta2.ebuild:
+  Create /etc/{passwd,pwd.db,spwd.db} from /etc/master.passwd
+  if any do not exist, #152856.
 
   19 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Remove 6.2_beta1 ebuild.
diff --git a/sys-freebsd/freebsd-usbin/Manifest b/sys-freebsd/freebsd-usbin/Manifest
index 1bf829a68470..732874ff10f1 100644
--- a/sys-freebsd/freebsd-usbin/Manifest
+++ b/sys-freebsd/freebsd-usbin/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX SA-06-15-ypserv.patch 1932 RMD160 ac1091c913eec8ae1f0c0c479346caf718f0c87a SHA1 337bb241dfa1178c3ce5bb4ec83b1505dc35dc41 SHA256 e56e30d3eb2a23d4a659d5f3effe907b6b00844fab719d3ca3465ae122c703d9
 MD5 7d750e2e1b9f098a196e03c727775fa2 files/SA-06-15-ypserv.patch 1932
 RMD160 ac1091c913eec8ae1f0c0c479346caf718f0c87a files/SA-06-15-ypserv.patch 1932
@@ -95,14 +92,14 @@ EBUILD freebsd-usbin-6.1-r1.ebuild 4711 RMD160 84233ad505daa08b6ac352edd733eee70
 MD5 f0ef09d38ccd6b0b7694725a18561ecd freebsd-usbin-6.1-r1.ebuild 4711
 RMD160 84233ad505daa08b6ac352edd733eee70c016672 freebsd-usbin-6.1-r1.ebuild 4711
 SHA256 c31b0b8d221d596f9eea396c655201fd2c6c7c18bbaf175f11ac81db9f459088 freebsd-usbin-6.1-r1.ebuild 4711
-EBUILD freebsd-usbin-6.2_beta2.ebuild 4801 RMD160 20451bec90dcc9c218bebae469df63cec9ec4985 SHA1 2d48586fe89b913e62062785ce1d353e904b2179 SHA256 8f61456c277586e42f83e32788a8b4e065bad26cec611375ebe023a4d83a2e94
-MD5 5d2bf966108f0b48833f617c746e58a5 freebsd-usbin-6.2_beta2.ebuild 4801
-RMD160 20451bec90dcc9c218bebae469df63cec9ec4985 freebsd-usbin-6.2_beta2.ebuild 4801
-SHA256 8f61456c277586e42f83e32788a8b4e065bad26cec611375ebe023a4d83a2e94 freebsd-usbin-6.2_beta2.ebuild 4801
-MISC ChangeLog 11338 RMD160 3dbd2773bebff82e223ae030c10509e696e13175 SHA1 abd5d128910fecad5d50e8cdb24c3d7246a36748 SHA256 9cac1a0c1239b70ebb490188441bbad49d5d74eed8efefe5db7b4de740d20e3e
-MD5 14acfa3dd4cfdd45edc89578bf12116a ChangeLog 11338
-RMD160 3dbd2773bebff82e223ae030c10509e696e13175 ChangeLog 11338
-SHA256 9cac1a0c1239b70ebb490188441bbad49d5d74eed8efefe5db7b4de740d20e3e ChangeLog 11338
+EBUILD freebsd-usbin-6.2_beta2.ebuild 5312 RMD160 a000ab232e7c60c0a3eb316acdfa089e5e955849 SHA1 c6903ce843897915d43feb832f62660b1572aa4a SHA256 23cd9ec12dacec0f9a49559b65e2d66229bb4b588a7ded0e1265adf1ab8b88fe
+MD5 6c1919b4bce5efe186b1340b74d22bbd freebsd-usbin-6.2_beta2.ebuild 5312
+RMD160 a000ab232e7c60c0a3eb316acdfa089e5e955849 freebsd-usbin-6.2_beta2.ebuild 5312
+SHA256 23cd9ec12dacec0f9a49559b65e2d66229bb4b588a7ded0e1265adf1ab8b88fe freebsd-usbin-6.2_beta2.ebuild 5312
+MISC ChangeLog 11515 RMD160 5cfd843f224d321ee27ae232c734a779f2b501c4 SHA1 ee52c3ba9b0e07cb0584f2a75cf2132d4d7eb129 SHA256 483662f5a8ebc4ea32daeff3f92399c92f2a4e2a04a885116e524fcadc945c27
+MD5 75655b955edc8d0727b4eca145519e5f ChangeLog 11515
+RMD160 5cfd843f224d321ee27ae232c734a779f2b501c4 ChangeLog 11515
+SHA256 483662f5a8ebc4ea32daeff3f92399c92f2a4e2a04a885116e524fcadc945c27 ChangeLog 11515
 MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7
 MD5 2bd48a5ae413433cbb36110b219ce97c metadata.xml 156
 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 metadata.xml 156
@@ -113,10 +110,3 @@ SHA256 391134c7559b784e096c3464be161bc6d6e5217f3b5de4326a1ba032f4a74882 files/di
 MD5 526d39ba749d0e29bab5fedebd1ded1a files/digest-freebsd-usbin-6.2_beta2 2484
 RMD160 756545bea319c6fb0ea9fb0ec7387875aa30dbd9 files/digest-freebsd-usbin-6.2_beta2 2484
 SHA256 9017f742fb7e3c379f20e76dd6a50a048d145c3000c80a86565f3897e064df7c files/digest-freebsd-usbin-6.2_beta2 2484
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-iD8DBQFFNwNGAiZjviIA2XgRAmzcAJsFkpf3Mm2rRXuhm/lI6kmsiNFF5gCfV/BQ
-Mkj76JX8xzod6A5+eEXGJDc=
-=sXB6
------END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_beta2.ebuild b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_beta2.ebuild
index 39a23cc01398..f44fbed0468f 100644
--- a/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_beta2.ebuild
+++ b/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_beta2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_beta2.ebuild,v 1.4 2006/10/17 10:33:31 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/freebsd-usbin-6.2_beta2.ebuild,v 1.5 2006/10/26 11:45:45 uberlord Exp $
 
 inherit bsdmk freebsd flag-o-matic eutils
 
@@ -155,6 +155,18 @@ EOS
 }
 
 pkg_postinst() {
+	# We need to run pwd_mkdb if key files are not present
+	# If they are, then there is no need to run pwd_mkdb
+	if [[ ! -e ${ROOT}etc/passwd || ! -e ${ROOT}etc/pwd.db || ! -e ${ROOT}etc/spwd.db ]] ; then
+		if [[ -e ${ROOT}etc/master.passwd ]] ; then
+			einfo "Generating passwd files from ${ROOT}etc/master.passwd"
+			${ROOT}usr/sbin/pwd_mkdb -p -d ${ROOT}etc ${ROOT}etc/master.passwd
+		else
+			eerror "${ROOT}etc/master.passwd does not exist!"
+			eerror "You will no be able to log into your system!"
+		fi
+	fi
+
 	for logfile in messages security auth.log maillog lpd-errs xferlog cron \
 		debug.log slip.log ppp.log; do
 		[[ -f ${ROOT}/var/log/${logfile} ]] || touch ${ROOT}/var/log/${logfile}