| 1 |
Closes: https://bugs.gentoo.org/687568 |
| 2 |
Signed-off-by: Michał Górny <mgorny@g.o> |
| 3 |
--- |
| 4 |
eclass/user.eclass | 54 +++------------------------------------------- |
| 5 |
1 file changed, 3 insertions(+), 51 deletions(-) |
| 6 |
|
| 7 |
diff --git a/eclass/user.eclass b/eclass/user.eclass |
| 8 |
index f6a10a6bee28..ef5d3bc5e6e0 100644 |
| 9 |
--- a/eclass/user.eclass |
| 10 |
+++ b/eclass/user.eclass |
| 11 |
@@ -1,4 +1,4 @@ |
| 12 |
-# Copyright 1999-2017 Gentoo Foundation |
| 13 |
+# Copyright 1999-2019 Gentoo Authors |
| 14 |
# Distributed under the terms of the GNU General Public License v2 |
| 15 |
|
| 16 |
# @ECLASS: user.eclass |
| 17 |
@@ -44,32 +44,6 @@ egetent() { |
| 18 |
esac |
| 19 |
|
| 20 |
case ${CHOST} in |
| 21 |
- *-darwin[678]) |
| 22 |
- case ${key} in |
| 23 |
- *[!0-9]*) # Non numeric |
| 24 |
- nidump ${db} . | awk -F: "(\$1 ~ /^${key}\$/) {print;exit;}" |
| 25 |
- ;; |
| 26 |
- *) # Numeric |
| 27 |
- nidump ${db} . | awk -F: "(\$3 == ${key}) {print;exit;}" |
| 28 |
- ;; |
| 29 |
- esac |
| 30 |
- ;; |
| 31 |
- *-darwin*) |
| 32 |
- local mykey |
| 33 |
- case ${db} in |
| 34 |
- passwd) db="Users" mykey="UniqueID" ;; |
| 35 |
- group) db="Groups" mykey="PrimaryGroupID" ;; |
| 36 |
- esac |
| 37 |
- |
| 38 |
- case ${key} in |
| 39 |
- *[!0-9]*) # Non numeric |
| 40 |
- dscl . -read /${db}/${key} 2>/dev/null |grep RecordName |
| 41 |
- ;; |
| 42 |
- *) # Numeric |
| 43 |
- dscl . -search /${db} ${mykey} ${key} 2>/dev/null |
| 44 |
- ;; |
| 45 |
- esac |
| 46 |
- ;; |
| 47 |
*-freebsd*|*-dragonfly*) |
| 48 |
case ${db} in |
| 49 |
passwd) db="user" ;; |
| 50 |
@@ -219,18 +193,6 @@ enewuser() { |
| 51 |
|
| 52 |
# add the user |
| 53 |
case ${CHOST} in |
| 54 |
- *-darwin*) |
| 55 |
- ### Make the user |
| 56 |
- dscl . create "/users/${euser}" uid ${euid} |
| 57 |
- dscl . create "/users/${euser}" shell "${eshell}" |
| 58 |
- dscl . create "/users/${euser}" home "${ehome}" |
| 59 |
- dscl . create "/users/${euser}" realname "added by portage for ${PN}" |
| 60 |
- ### Add the user to the groups specified |
| 61 |
- for g in "${egroups_arr[@]}" ; do |
| 62 |
- dscl . merge "/groups/${g}" users "${euser}" |
| 63 |
- done |
| 64 |
- ;; |
| 65 |
- |
| 66 |
*-freebsd*|*-dragonfly*) |
| 67 |
pw useradd "${euser}" "${opts[@]}" || die |
| 68 |
;; |
| 69 |
@@ -318,12 +280,6 @@ enewgroup() { |
| 70 |
|
| 71 |
# add the group |
| 72 |
case ${CHOST} in |
| 73 |
- *-darwin*) |
| 74 |
- _enewgroup_next_gid |
| 75 |
- dscl . create "/groups/${egroup}" gid ${egid} |
| 76 |
- dscl . create "/groups/${egroup}" passwd '*' |
| 77 |
- ;; |
| 78 |
- |
| 79 |
*-freebsd*|*-dragonfly*) |
| 80 |
_enewgroup_next_gid |
| 81 |
pw groupadd "${egroup}" -g ${egid} || die |
| 82 |
@@ -358,7 +314,7 @@ egethome() { |
| 83 |
[[ $# -eq 1 ]] || die "usage: egethome <user>" |
| 84 |
|
| 85 |
case ${CHOST} in |
| 86 |
- *-darwin*|*-freebsd*|*-dragonfly*) |
| 87 |
+ *-freebsd*|*-dragonfly*) |
| 88 |
pos=9 |
| 89 |
;; |
| 90 |
*) # Linux, NetBSD, OpenBSD, etc... |
| 91 |
@@ -379,7 +335,7 @@ egetshell() { |
| 92 |
[[ $# -eq 1 ]] || die "usage: egetshell <user>" |
| 93 |
|
| 94 |
case ${CHOST} in |
| 95 |
- *-darwin*|*-freebsd*|*-dragonfly*) |
| 96 |
+ *-freebsd*|*-dragonfly*) |
| 97 |
pos=10 |
| 98 |
;; |
| 99 |
*) # Linux, NetBSD, OpenBSD, etc... |
| 100 |
@@ -444,10 +400,6 @@ esethome() { |
| 101 |
|
| 102 |
# update the home directory |
| 103 |
case ${CHOST} in |
| 104 |
- *-darwin*) |
| 105 |
- dscl . change "/users/${euser}" home "${ehome}" |
| 106 |
- ;; |
| 107 |
- |
| 108 |
*-freebsd*|*-dragonfly*) |
| 109 |
pw usermod "${euser}" -d "${ehome}" && return 0 |
| 110 |
[[ $? == 8 ]] && eerror "${euser} is in use, cannot update home" |
| 111 |
-- |
| 112 |
2.22.0.rc3 |
Archives