diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2014-01-07 09:12:01 +0000 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2014-01-07 09:12:01 +0000 |
commit | b8452f76beabf8b3ab96770ef6ceefeaf6896550 (patch) | |
tree | 109429fb8d5d0bd6d3c9413d288307e1ad6ac387 /sys-apps | |
parent | Version bump, add libwacom dependency for bug #389633. (diff) | |
download | gentoo-2-b8452f76beabf8b3ab96770ef6ceefeaf6896550.tar.gz gentoo-2-b8452f76beabf8b3ab96770ef6ceefeaf6896550.tar.bz2 gentoo-2-b8452f76beabf8b3ab96770ef6ceefeaf6896550.zip |
Removed old versions and files. Converted remaining ebuild to EAPI-4
(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
Diffstat (limited to 'sys-apps')
27 files changed, 28 insertions, 1806 deletions
diff --git a/sys-apps/shadow/ChangeLog b/sys-apps/shadow/ChangeLog index f8d0f2a64a79..ffcc1c20104e 100644 --- a/sys-apps/shadow/ChangeLog +++ b/sys-apps/shadow/ChangeLog @@ -1,6 +1,25 @@ # ChangeLog for sys-apps/shadow -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.290 2013/09/15 19:11:22 vapier Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/ChangeLog,v 1.291 2014/01/07 09:12:01 polynomial-c Exp $ + + 07 Jan 2014; Lars Wendler <polynomial-c@gentoo.org> + -shadow-4.1.4.2-r6.ebuild, -shadow-4.1.4.3.ebuild, -shadow-4.1.5.ebuild, + -shadow-4.1.5-r1.ebuild, -shadow-4.1.5-r2.ebuild, -shadow-4.1.5.1.ebuild, + shadow-4.1.5.1-r1.ebuild, -files/pam.d-include/system-auth-1.1, + -files/shadow-4.1.4.2-env-reset-keep-locale.patch, + -files/shadow-4.1.4.2-fix-etc-gshadow-reading.patch, + -files/shadow-4.1.4.2-groupmod-pam-check.patch, + -files/shadow-4.1.4.2-su_no_sanitize_env.patch, + -files/shadow-4.1.4.3-dup-install-targets.patch, + -files/shadow-4.1.5-grremove.patch, + -files/shadow-4.1.5-nscd-ignore-exit-1.patch, + -files/shadow-4.1.5-nscd-newline-msg.patch, + -files/shadow-4.1.5-selinux-groupadd.patch, -files/shadow-4.1.5-stdarg.patch, + -files/login.defs, -files/login.pamd.3, -files/login_defs.awk, + -files/pam.d-include/login, -files/pam.d-include/other, + -files/pam.d-include/su, -files/pam.d-include/su-openpam, + -files/pam.d-include/system-auth: + Removed old versions and files. Converted remaining ebuild to EAPI-4. 15 Sep 2013; Mike Frysinger <vapier@gentoo.org> shadow-4.1.5.1-r1.ebuild: Add ttymxc{2,3} #484834 by Steev Klimaszewski. diff --git a/sys-apps/shadow/files/login.defs b/sys-apps/shadow/files/login.defs deleted file mode 100644 index 4aa7044bec22..000000000000 --- a/sys-apps/shadow/files/login.defs +++ /dev/null @@ -1,212 +0,0 @@ -# -# /etc/login.defs - Configuration control definitions for the login package. -# -# $Id: login.defs,v 1.6 2006/03/12 23:47:08 flameeyes Exp $ -# -# Three items must be defined: MAIL_DIR, ENV_SUPATH, and ENV_PATH. -# If unspecified, some arbitrary (and possibly incorrect) value will -# be assumed. All other items are optional - if not specified then -# the described action or option will be inhibited. -# -# Comment lines (lines beginning with "#") and blank lines are ignored. -# -# Modified for Linux. --marekm - -# -# Delay in seconds before being allowed another attempt after a login failure -# -FAIL_DELAY 3 - -# -# Enable display of unknown usernames when login failures are recorded. -# -LOG_UNKFAIL_ENAB no - -# -# Enable logging of successful logins -# -LOG_OK_LOGINS no - -# -# Enable "syslog" logging of su activity - in addition to sulog file logging. -# SYSLOG_SG_ENAB does the same for newgrp and sg. -# -SYSLOG_SU_ENAB yes -SYSLOG_SG_ENAB yes - -# -# If defined, either full pathname of a file containing device names or -# a ":" delimited list of device names. Root logins will be allowed only -# upon these devices. -# -CONSOLE /etc/securetty -#CONSOLE console:tty01:tty02:tty03:tty04 - -# -# If defined, all su activity is logged to this file. -# -#SULOG_FILE /var/log/sulog - -# -# If defined, file which maps tty line to TERM environment parameter. -# Each line of the file is in a format something like "vt100 tty01". -# -#TTYTYPE_FILE /etc/ttytype - -# -# If defined, the command name to display when running "su -". For -# example, if this is defined as "su" then a "ps" will display the -# command is "-su". If not defined, then "ps" would display the -# name of the shell actually being run, e.g. something like "-sh". -# -SU_NAME su - -# -# *REQUIRED* -# Directory where mailboxes reside, _or_ name of file, relative to the -# home directory. If you _do_ define both, MAIL_DIR takes precedence. -# -MAIL_DIR /var/spool/mail - -# -# If defined, file which inhibits all the usual chatter during the login -# sequence. If a full pathname, then hushed mode will be enabled if the -# user's name or shell are found in the file. If not a full pathname, then -# hushed mode will be enabled if the file exists in the user's home directory. -# -HUSHLOGIN_FILE .hushlogin -#HUSHLOGIN_FILE /etc/hushlogins - -# -# *REQUIRED* The default PATH settings, for superuser and normal users. -# -# (they are minimal, add the rest in the shell startup files) -ENV_SUPATH PATH=/sbin:/bin:/usr/sbin:/usr/bin -ENV_PATH PATH=/bin:/usr/bin - -# -# Terminal permissions -# -# TTYGROUP Login tty will be assigned this group ownership. -# TTYPERM Login tty will be set to this permission. -# -# If you have a "write" program which is "setgid" to a special group -# which owns the terminals, define TTYGROUP to the group number and -# TTYPERM to 0620. Otherwise leave TTYGROUP commented out and assign -# TTYPERM to either 622 or 600. -# -TTYGROUP tty -TTYPERM 0600 - -# -# Login configuration initializations: -# -# ERASECHAR Terminal ERASE character ('\010' = backspace). -# KILLCHAR Terminal KILL character ('\025' = CTRL/U). -# UMASK Default "umask" value. -# -# The ERASECHAR and KILLCHAR are used only on System V machines. -# The ULIMIT is used only if the system supports it. -# (now it works with setrlimit too; ulimit is in 512-byte units) -# -# Prefix these values with "0" to get octal, "0x" to get hexadecimal. -# -ERASECHAR 0177 -KILLCHAR 025 -UMASK 022 - -# -# Password aging controls: -# -# PASS_MAX_DAYS Maximum number of days a password may be used. -# PASS_MIN_DAYS Minimum number of days allowed between password changes. -# PASS_WARN_AGE Number of days warning given before a password expires. -# -PASS_MAX_DAYS 99999 -PASS_MIN_DAYS 0 -PASS_WARN_AGE 7 - -# -# Min/max values for automatic uid selection in useradd -# -UID_MIN 1000 -UID_MAX 60000 - -# -# Min/max values for automatic gid selection in groupadd -# -GID_MIN 100 -GID_MAX 60000 - -# -# Max number of login retries if password is bad -# -LOGIN_RETRIES 3 - -# -# Max time in seconds for login -# -LOGIN_TIMEOUT 60 - -# -# Which fields may be changed by regular users using chfn - use -# any combination of letters "frwh" (full name, room number, work -# phone, home phone). If not defined, no changes are allowed. -# For backward compatibility, "yes" = "rwh" and "no" = "frwh". -# -CHFN_RESTRICT rwh - -# -# List of groups to add to the user's supplementary group set -# when logging in on the console (as determined by the CONSOLE -# setting). Default is none. -# -# Use with caution - it is possible for users to gain permanent -# access to these groups, even when not logged in on the console. -# How to do it is left as an exercise for the reader... -# -#CONSOLE_GROUPS floppy:audio:cdrom - -# -# Should login be allowed if we can't cd to the home directory? -# Default in no. -# -DEFAULT_HOME yes - -# -# If defined, this command is run when removing a user. -# It should remove any at/cron/print jobs etc. owned by -# the user to be removed (passed as the first argument). -# -#USERDEL_CMD /usr/sbin/userdel_local - -# -# When prompting for password without echo, getpass() can optionally -# display a random number (in the range 1 to GETPASS_ASTERISKS) of '*' -# characters for each character typed. This feature is designed to -# confuse people looking over your shoulder when you enter a password :-). -# Also, the new getpass() accepts both Backspace (8) and Delete (127) -# keys to delete previous character (to cope with different terminal -# types), Control-U to delete all characters, and beeps when there are -# no more characters to delete, or too many characters entered. -# -# Setting GETPASS_ASTERISKS to 1 results in more traditional behaviour - -# exactly one '*' displayed for each character typed. -# -# Setting GETPASS_ASTERISKS to 0 disables the '*' characters (Backspace, -# Delete, Control-U and beep continue to work as described above). -# -# Setting GETPASS_ASTERISKS to -1 reverts to the traditional getpass() -# without any new features. This is the default. -# -GETPASS_ASTERISKS 0 - -# -# Enable setting of the umask group bits to be the same as owner bits -# (examples: 022 -> 002, 077 -> 007) for non-root users, if the uid is -# the same as gid, and username is the same as the primary group name. -# -# This also enables userdel to remove user groups if no members exist. -# -USERGROUPS_ENAB yes - diff --git a/sys-apps/shadow/files/login.pamd.3 b/sys-apps/shadow/files/login.pamd.3 deleted file mode 100644 index 13abd2796b4a..000000000000 --- a/sys-apps/shadow/files/login.pamd.3 +++ /dev/null @@ -1,6 +0,0 @@ -auth required pam_securetty.so -auth include system-local-login - -account include system-local-login -password include system-local-login -session include system-local-login diff --git a/sys-apps/shadow/files/login_defs.awk b/sys-apps/shadow/files/login_defs.awk deleted file mode 100644 index 56087c647ed3..000000000000 --- a/sys-apps/shadow/files/login_defs.awk +++ /dev/null @@ -1,32 +0,0 @@ -# Fixes up login defs for PAM by commenting all non-PAM options and adding a -# comment that it is not supported with PAM. -# -# Call with lib/getdef.c and etc/login.defs as args in the root source directory -# of shadow, ie: -# -# gawk -f login_defs.awk lib/getdef.c etc/login.defs > login.defs.new -# - -(FILENAME == "lib/getdef.c") { - if ($2 == "USE_PAM") - start_printing = 1 - else if ($1 == "#endif") - nextfile - else if (start_printing == 1) - VARS[count++] = substr($1, 3, length($1) - 4) -} - -(FILENAME != "lib/getdef.c") { - print_line = 1 - for (x in VARS) { - regex = "(^|#)" VARS[x] - if ($0 ~ regex) { - print_line = 0 - printf("%s%s\t(NOT SUPPORTED WITH PAM)\n", - ($0 ~ /^#/) ? "" : "#", $0) - } - } - if (print_line) - print $0 -} - diff --git a/sys-apps/shadow/files/pam.d-include/login b/sys-apps/shadow/files/pam.d-include/login deleted file mode 100644 index 9d2167793cc5..000000000000 --- a/sys-apps/shadow/files/pam.d-include/login +++ /dev/null @@ -1,12 +0,0 @@ -#%PAM-1.0 - -auth required pam_securetty.so -auth include system-auth -auth required pam_nologin.so - -account include system-auth - -password include system-auth - -session include system-auth -session optional pam_console.so diff --git a/sys-apps/shadow/files/pam.d-include/other b/sys-apps/shadow/files/pam.d-include/other deleted file mode 100644 index bb0b9647c076..000000000000 --- a/sys-apps/shadow/files/pam.d-include/other +++ /dev/null @@ -1,9 +0,0 @@ -#%PAM-1.0 - -auth required pam_deny.so - -account required pam_deny.so - -password required pam_deny.so - -session required pam_deny.so diff --git a/sys-apps/shadow/files/pam.d-include/su b/sys-apps/shadow/files/pam.d-include/su deleted file mode 100644 index d15c7edfc5d9..000000000000 --- a/sys-apps/shadow/files/pam.d-include/su +++ /dev/null @@ -1,32 +0,0 @@ -#%PAM-1.0 - -auth sufficient pam_rootok.so - -# If you want to restrict users begin allowed to su even more, -# create /etc/security/suauth.allow (or to that matter) that is only -# writable by root, and add users that are allowed to su to that -# file, one per line. -#auth required pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.allow - -# Uncomment this to allow users in the wheel group to su without -# entering a passwd. -#auth sufficient pam_wheel.so use_uid trust - -# Alternatively to above, you can implement a list of users that do -# not need to supply a passwd with a list. -#auth sufficient pam_listfile.so item=ruser sense=allow onerr=fail file=/etc/security/suauth.nopass - -# Comment this to allow any user, even those not in the 'wheel' -# group to su -auth required pam_wheel.so use_uid - -auth include system-auth - -account include system-auth - -password include system-auth - -session include system-auth -session required pam_env.so -session optional pam_xauth.so - diff --git a/sys-apps/shadow/files/pam.d-include/su-openpam b/sys-apps/shadow/files/pam.d-include/su-openpam deleted file mode 100644 index e9ec7d3dd295..000000000000 --- a/sys-apps/shadow/files/pam.d-include/su-openpam +++ /dev/null @@ -1,14 +0,0 @@ -#%PAM-1.0 - -auth sufficient pam_rootok.so - -auth include system-auth - -account include system-auth - -password include system-auth - -session include system-auth -session required pam_env.so -session optional pam_xauth.so - diff --git a/sys-apps/shadow/files/pam.d-include/system-auth b/sys-apps/shadow/files/pam.d-include/system-auth deleted file mode 100644 index b7c37afdad1f..000000000000 --- a/sys-apps/shadow/files/pam.d-include/system-auth +++ /dev/null @@ -1,14 +0,0 @@ -#%PAM-1.0 - -auth required pam_env.so -auth sufficient pam_unix.so likeauth nullok nodelay -auth required pam_deny.so - -account required pam_unix.so - -password required pam_cracklib.so retry=3 -password sufficient pam_unix.so nullok md5 shadow use_authtok -password required pam_deny.so - -session required pam_limits.so -session required pam_unix.so diff --git a/sys-apps/shadow/files/pam.d-include/system-auth-1.1 b/sys-apps/shadow/files/pam.d-include/system-auth-1.1 deleted file mode 100644 index fe80483120ae..000000000000 --- a/sys-apps/shadow/files/pam.d-include/system-auth-1.1 +++ /dev/null @@ -1,14 +0,0 @@ -#%PAM-1.0 - -auth required pam_env.so -auth sufficient pam_unix.so likeauth nullok -auth required pam_deny.so - -account required pam_unix.so - -password required pam_cracklib.so retry=3 -password sufficient pam_unix.so nullok md5 shadow use_authtok -password required pam_deny.so - -session required pam_limits.so -session required pam_unix.so diff --git a/sys-apps/shadow/files/shadow-4.1.4.2-env-reset-keep-locale.patch b/sys-apps/shadow/files/shadow-4.1.4.2-env-reset-keep-locale.patch deleted file mode 100644 index 7c83f7cd0568..000000000000 --- a/sys-apps/shadow/files/shadow-4.1.4.2-env-reset-keep-locale.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://bugs.gentoo.org/283725 -https://alioth.debian.org/tracker/index.php?func=detail&aid=311740&group_id=30580&atid=411480 - ---- shadow-4.1.4.2/libmisc/env.c -+++ shadow-4.1.4.2/libmisc/env.c -@@ -251,7 +251,7 @@ - if (strncmp (*cur, *bad, strlen (*bad)) != 0) { - continue; - } -- if (strchr (*cur, '/') != NULL) { -+ if (strchr (*cur, '/') == NULL) { - continue; /* OK */ - } - for (move = cur; NULL != *move; move++) { diff --git a/sys-apps/shadow/files/shadow-4.1.4.2-fix-etc-gshadow-reading.patch b/sys-apps/shadow/files/shadow-4.1.4.2-fix-etc-gshadow-reading.patch deleted file mode 100644 index f8025a0530f3..000000000000 --- a/sys-apps/shadow/files/shadow-4.1.4.2-fix-etc-gshadow-reading.patch +++ /dev/null @@ -1,27 +0,0 @@ -http://bugs.debian.org/569899 -http://bugs.gentoo.org/327605 - -buf is not an array, it's a static pointer, so we have to use buflen - ---- lib/gshadow.c -+++ lib/gshadow.c -@@ -222,6 +222,7 @@ - if (NULL == buf) { - return NULL; - } -+ buflen = BUFSIZ; - } - - if (NULL == fp) { -@@ -229,9 +230,9 @@ - } - - #ifdef USE_NIS -- while (fgetsx (buf, (int) sizeof buf, fp) == buf) -+ while (fgetsx (buf, buflen, fp) == buf) - #else -- if (fgetsx (buf, (int) sizeof buf, fp) == buf) -+ if (fgetsx (buf, buflen, fp) == buf) - #endif - { - while ( ((cp = strrchr (buf, '\n')) == NULL) diff --git a/sys-apps/shadow/files/shadow-4.1.4.2-groupmod-pam-check.patch b/sys-apps/shadow/files/shadow-4.1.4.2-groupmod-pam-check.patch deleted file mode 100644 index f25c4e10ff84..000000000000 --- a/sys-apps/shadow/files/shadow-4.1.4.2-groupmod-pam-check.patch +++ /dev/null @@ -1,21 +0,0 @@ -http://bugs.gentoo.org/300790 -http://lists.alioth.debian.org/pipermail/pkg-shadow-devel/2009-November/007850.html - -2009-11-05 Nicolas François <nicolas.francois@centraliens.net> - - * NEWS, src/groupmod.c: Fixed groupmod when configured with - --enable-account-tools-setuid. - -diff --git a/src/groupmod.c b/src/groupmod.c -index 4205df2..da6d77f 100644 ---- a/src/groupmod.c -+++ b/src/groupmod.c -@@ -724,7 +724,7 @@ int main (int argc, char **argv) - { - struct passwd *pampw; - pampw = getpwuid (getuid ()); /* local, no need for xgetpwuid */ -- if (NULL == pamh) { -+ if (NULL == pampw) { - fprintf (stderr, - _("%s: Cannot determine your user name.\n"), - Prog); diff --git a/sys-apps/shadow/files/shadow-4.1.4.2-su_no_sanitize_env.patch b/sys-apps/shadow/files/shadow-4.1.4.2-su_no_sanitize_env.patch deleted file mode 100644 index 0cf74f897565..000000000000 --- a/sys-apps/shadow/files/shadow-4.1.4.2-su_no_sanitize_env.patch +++ /dev/null @@ -1,14 +0,0 @@ -http://bugs.gentoo.org/show_bug.cgi?id=301957 -https://alioth.debian.org/scm/browser.php?group_id=30580 - ---- a/src/su.c -+++ b/src/su.c -@@ -342,7 +342,7 @@ - #endif - #endif /* !USE_PAM */ - -- sanitize_env (); -+ /* sanitize_env (); */ - - (void) setlocale (LC_ALL, ""); - (void) bindtextdomain (PACKAGE, LOCALEDIR); diff --git a/sys-apps/shadow/files/shadow-4.1.4.3-dup-install-targets.patch b/sys-apps/shadow/files/shadow-4.1.4.3-dup-install-targets.patch deleted file mode 100644 index 6452d1721afc..000000000000 --- a/sys-apps/shadow/files/shadow-4.1.4.3-dup-install-targets.patch +++ /dev/null @@ -1,15 +0,0 @@ -the Makefile.am manualy adds man_nopam to the install list, and then also -optionally appends it which leads to the `install` error: - ... will not overwrite just-created ... - ---- shadow-4.1.4.3/man/ru/Makefile.in -+++ shadow-4.1.4.3/man/ru/Makefile.in -@@ -222,7 +222,7 @@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --man_MANS = $(man_nopam) chage.1 chfn.1 chgpasswd.8 chpasswd.8 chsh.1 \ -+man_MANS = chage.1 chfn.1 chgpasswd.8 chpasswd.8 chsh.1 \ - expiry.1 faillog.5 faillog.8 getspnam.3 gpasswd.1 groupadd.8 \ - groupdel.8 groupmems.8 groupmod.8 groups.1 grpck.8 grpconv.8 \ - grpunconv.8 gshadow.5 lastlog.8 login.1 login.defs.5 logoutd.8 \ diff --git a/sys-apps/shadow/files/shadow-4.1.5-grremove.patch b/sys-apps/shadow/files/shadow-4.1.5-grremove.patch deleted file mode 100644 index 96062ae15d2b..000000000000 --- a/sys-apps/shadow/files/shadow-4.1.5-grremove.patch +++ /dev/null @@ -1,49 +0,0 @@ -https://bugs.gentoo.org/405409 - -http://lists.alioth.debian.org/pipermail/pkg-shadow-devel/2012-February/009159.html -http://lists.alioth.debian.org/pipermail/pkg-shadow-devel/2012-March/009196.html - ---- shadow-4.1.5/src/userdel.c -+++ shadow-4.1.5/src/userdel.c -@@ -333,22 +333,22 @@ static void remove_usergroup (void) - * We can remove this group, it is not the primary - * group of any remaining user. - */ -- if (gr_remove (grp->gr_name) == 0) { -+ if (gr_remove (user_name) == 0) { - fprintf (stderr, - _("%s: cannot remove entry '%s' from %s\n"), -- Prog, grp->gr_name, gr_dbname ()); -+ Prog, user_name, gr_dbname ()); - fail_exit (E_GRP_UPDATE); - } - - #ifdef WITH_AUDIT - audit_logger (AUDIT_DEL_GROUP, Prog, - "deleting group", -- grp->gr_name, AUDIT_NO_ID, -+ user_name, AUDIT_NO_ID, - SHADOW_AUDIT_SUCCESS); - #endif /* WITH_AUDIT */ - SYSLOG ((LOG_INFO, - "removed group '%s' owned by '%s'\n", -- grp->gr_name, user_name)); -+ user_name, user_name)); - - #ifdef SHADOWGRP - if (sgr_locate (user_name) != NULL) { -@@ -361,12 +361,12 @@ static void remove_usergroup (void) - #ifdef WITH_AUDIT - audit_logger (AUDIT_DEL_GROUP, Prog, - "deleting shadow group", -- grp->gr_name, AUDIT_NO_ID, -+ user_name, AUDIT_NO_ID, - SHADOW_AUDIT_SUCCESS); - #endif /* WITH_AUDIT */ - SYSLOG ((LOG_INFO, - "removed shadow group '%s' owned by '%s'\n", -- grp->gr_name, user_name)); -+ user_name, user_name)); - - } - #endif /* SHADOWGRP */ diff --git a/sys-apps/shadow/files/shadow-4.1.5-nscd-ignore-exit-1.patch b/sys-apps/shadow/files/shadow-4.1.5-nscd-ignore-exit-1.patch deleted file mode 100644 index 49f75e049818..000000000000 --- a/sys-apps/shadow/files/shadow-4.1.5-nscd-ignore-exit-1.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 357ff92218a68f2ea74b9d08867c662571012bbe Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sun, 12 Feb 2012 23:37:04 -0500 -Subject: [PATCH 3/3] nscd: ignore exit 1 code - -If nscd is installed but not in use, then running `nscd -i` will exit(1). -We shouldn't warn in this case since this is not abnormal behavior. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - lib/nscd.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/lib/nscd.c b/lib/nscd.c -index ea1dc55..7adb58f 100644 ---- a/lib/nscd.c -+++ b/lib/nscd.c -@@ -39,6 +39,9 @@ int nscd_flush_cache (const char *service) - /* nscd is not installed, or it is installed but uses an - interpreter that is missing. Probably the former. */ - return 0; -+ } else if (code == 1) { -+ /* nscd is installed, but it isn't active. */ -+ return 0; - } else if (code != 0) { - (void) fprintf (stderr, _("%s: nscd exited with status %d\n"), - Prog, code); --- -1.7.8.4 - diff --git a/sys-apps/shadow/files/shadow-4.1.5-nscd-newline-msg.patch b/sys-apps/shadow/files/shadow-4.1.5-nscd-newline-msg.patch deleted file mode 100644 index 2df107fc0921..000000000000 --- a/sys-apps/shadow/files/shadow-4.1.5-nscd-newline-msg.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 360351b9b99bba0a278923c4237d158cbd726df5 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sun, 12 Feb 2012 23:08:42 -0500 -Subject: [PATCH 1/3] nscd: add missing newline to warning msg - -Trying to run `passwd` without nscd running shows the messages: -... -Re-enter new password: -passwd: nscd exited with status 1passwd: Failed to flush the nscd cache. -passwd: nscd exited with status 1passwd: Failed to flush the nscd cache. -passwd: nscd exited with status 1passwd: Failed to flush the nscd cache. -passwd: nscd exited with status 1passwd: Failed to flush the nscd cache. -passwd: password changed. -... - -You can see the status message missing a newline, so add it. - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - lib/nscd.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/lib/nscd.c b/lib/nscd.c -index 227c205..ea1dc55 100644 ---- a/lib/nscd.c -+++ b/lib/nscd.c -@@ -40,7 +40,7 @@ int nscd_flush_cache (const char *service) - interpreter that is missing. Probably the former. */ - return 0; - } else if (code != 0) { -- (void) fprintf (stderr, _("%s: nscd exited with status %d"), -+ (void) fprintf (stderr, _("%s: nscd exited with status %d\n"), - Prog, code); - (void) fprintf (stderr, _(MSG_NSCD_FLUSH_CACHE_FAILED), Prog); - return -1; --- -1.7.8.4 - diff --git a/sys-apps/shadow/files/shadow-4.1.5-selinux-groupadd.patch b/sys-apps/shadow/files/shadow-4.1.5-selinux-groupadd.patch deleted file mode 100644 index 5a95c0f87764..000000000000 --- a/sys-apps/shadow/files/shadow-4.1.5-selinux-groupadd.patch +++ /dev/null @@ -1,32 +0,0 @@ -http://lists.alioth.debian.org/pipermail/pkg-shadow-devel/2012-March/009205.html - -https://bugs.gentoo.org/406819 - ---- shadow-4.1.5/lib/commonio.c -+++ shadow-4.1.5/lib/commonio.c -@@ -977,6 +977,12 @@ int commonio_close (struct commonio_db * - - snprintf (buf, sizeof buf, "%s+", db->filename); - -+#ifdef WITH_SELINUX -+ if (set_selinux_file_context (buf) != 0) { -+ errors++; -+ } -+#endif -+ - db->fp = fopen_set_perms (buf, "w", &sb); - if (NULL == db->fp) { - goto fail; -@@ -1011,6 +1017,12 @@ int commonio_close (struct commonio_db * - goto fail; - } - -+#ifdef WITH_SELINUX -+ if (reset_selinux_file_context () != 0) { -+ goto fail; -+ } -+#endif -+ - nscd_need_reload = true; - goto success; - fail: diff --git a/sys-apps/shadow/files/shadow-4.1.5-stdarg.patch b/sys-apps/shadow/files/shadow-4.1.5-stdarg.patch deleted file mode 100644 index 4ed370c7e63b..000000000000 --- a/sys-apps/shadow/files/shadow-4.1.5-stdarg.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 04d19a920ea0cf74f977006e3f8241bf77cbc16b Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Sun, 12 Feb 2012 22:41:05 -0500 -Subject: [PATCH] copydir: include stdarg.h for va_* funcs - -Building on newer systems fails due to using stdargs but not including -the header file: - -copydir.c: In function 'error_acl': -copydir.c:126:2: warning: implicit declaration of function 'va_start' [-Wimplicit-function-declaration] -copydir.c:132:2: warning: implicit declaration of function 'va_end' [-Wimplicit-function-declaration] -... -libmisc/copydir.c:126: undefined reference to 'va_start' -libmisc/copydir.c:132: undefined reference to 'va_end' -... -make[2]: *** [useradd] Error 1 - -Signed-off-by: Mike Frysinger <vapier@gentoo.org> ---- - libmisc/copydir.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/libmisc/copydir.c b/libmisc/copydir.c -index 7cb5f56..c6cbe6b 100644 ---- a/libmisc/copydir.c -+++ b/libmisc/copydir.c -@@ -40,6 +40,7 @@ - #include <sys/time.h> - #include <fcntl.h> - #include <stdio.h> -+#include <stdarg.h> - #include "prototypes.h" - #include "defines.h" - #ifdef WITH_SELINUX --- -1.7.8.4 - diff --git a/sys-apps/shadow/shadow-4.1.4.2-r6.ebuild b/sys-apps/shadow/shadow-4.1.4.2-r6.ebuild deleted file mode 100644 index c12a1b06b832..000000000000 --- a/sys-apps/shadow/shadow-4.1.4.2-r6.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.4.2-r6.ebuild,v 1.9 2011/09/03 09:13:57 scarabeus Exp $ - -inherit eutils libtool toolchain-funcs pam multilib - -DESCRIPTION="Utilities to deal with user accounts" -HOMEPAGE="http://shadow.pld.org.pl/ http://pkg-shadow.alioth.debian.org/" -SRC_URI="http://pkg-shadow.alioth.debian.org/releases/${P}.tar.bz2" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="audit cracklib nls pam selinux skey" - -RDEPEND="audit? ( sys-process/audit ) - cracklib? ( >=sys-libs/cracklib-2.7-r3 ) - pam? ( virtual/pam ) - skey? ( sys-auth/skey ) - selinux? ( >=sys-libs/libselinux-1.28 ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" -RDEPEND="${RDEPEND} - pam? ( >=sys-auth/pambase-20080219.1 )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-4.1.4.2-env-reset-keep-locale.patch #283725 - epatch "${FILESDIR}"/${PN}-4.1.3-dots-in-usernames.patch #22920 - epatch "${FILESDIR}"/${PN}-4.1.4.2-groupmod-pam-check.patch #300790 - epatch "${FILESDIR}"/${PN}-4.1.4.2-su_no_sanitize_env.patch #301957 - epatch "${FILESDIR}"/${PN}-4.1.4.2-fix-etc-gshadow-reading.patch #327605 - elibtoolize - epunt_cxx -} - -src_compile() { - tc-is-cross-compiler && export ac_cv_func_setpgrp_void=yes - econf \ - --without-group-name-max-length \ - --enable-shared=no \ - --enable-static=yes \ - $(use_with audit) \ - $(use_with cracklib libcrack) \ - $(use_with pam libpam) \ - $(use_with skey) \ - $(use_with selinux) \ - $(use_enable nls) \ - $(use_with elibc_glibc nscd) - emake || die "compile problem" -} - -set_login_opt() { - local comment="" opt=$1 val=$2 - [[ -z ${val} ]] && comment="#" - sed -i -r \ - -e "/^#?${opt}/s:.*:${comment}${opt} ${val}:" \ - "${D}"/etc/login.defs - local res=$(grep "^${comment}${opt}" "${D}"/etc/login.defs) - einfo ${res:-Unable to find ${opt} in /etc/login.defs} -} - -src_install() { - emake DESTDIR="${D}" suidperms=4711 install || die "install problem" - - # Remove libshadow and libmisc; see bug 37725 and the following - # comment from shadow's README.linux: - # Currently, libshadow.a is for internal use only, so if you see - # -lshadow in a Makefile of some other package, it is safe to - # remove it. - rm -f "${D}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la} - - insinto /etc - # Using a securetty with devfs device names added - # (compat names kept for non-devfs compatibility) - insopts -m0600 ; doins "${FILESDIR}"/securetty - if ! use pam ; then - insopts -m0600 - doins etc/login.access etc/limits - fi - # Output arch-specific cruft - local devs - case $(tc-arch) in - ppc*) devs="hvc0 hvsi0 ttyPSC0";; - hppa) devs="ttyB0";; - arm) devs="ttyFB0";; - sh) devs="ttySC0 ttySC1";; - esac - [[ -n ${devs} ]] && printf '%s\n' ${devs} >> "${D}"/etc/securetty - - # needed for 'useradd -D' - insinto /etc/default - insopts -m0600 - doins "${FILESDIR}"/default/useradd - - # move passwd to / to help recover broke systems #64441 - mv "${D}"/usr/bin/passwd "${D}"/bin/ - dosym /bin/passwd /usr/bin/passwd - - cd "${S}" - insinto /etc - insopts -m0644 - newins etc/login.defs login.defs - - if ! use pam ; then - set_login_opt MAIL_CHECK_ENAB no - set_login_opt SU_WHEEL_ONLY yes - set_login_opt CRACKLIB_DICTPATH /usr/$(get_libdir)/cracklib_dict - set_login_opt LOGIN_RETRIES 3 - set_login_opt ENCRYPT_METHOD SHA512 - else - dopamd "${FILESDIR}/pam.d-include/"{su,shadow} - - newpamd "${FILESDIR}/login.pamd.3" login - - for x in passwd chpasswd chgpasswd; do - newpamd "${FILESDIR}"/pam.d-include/passwd ${x} || die - done - - for x in chage chsh chfn newusers \ - user{add,del,mod} group{add,del,mod} ; do - newpamd "${FILESDIR}"/pam.d-include/shadow ${x} || die - done - - # comment out login.defs options that pam hates - local opt - for opt in \ - CHFN_AUTH \ - CRACKLIB_DICTPATH \ - ENV_HZ \ - ENVIRON_FILE \ - FAILLOG_ENAB \ - FTMP_FILE \ - LASTLOG_ENAB \ - MAIL_CHECK_ENAB \ - MOTD_FILE \ - NOLOGINS_FILE \ - OBSCURE_CHECKS_ENAB \ - PASS_ALWAYS_WARN \ - PASS_CHANGE_TRIES \ - PASS_MIN_LEN \ - PORTTIME_CHECKS_ENAB \ - QUOTAS_ENAB \ - SU_WHEEL_ONLY - do - set_login_opt ${opt} - done - - sed -i -f "${FILESDIR}"/login_defs_pam.sed \ - "${D}"/etc/login.defs - - # remove manpages that pam will install for us - # and/or don't apply when using pam - find "${D}"/usr/share/man \ - '(' -name 'limits.5*' -o -name 'suauth.5*' ')' \ - -exec rm {} + - fi - - # Remove manpages that are handled by other packages - find "${D}"/usr/share/man \ - '(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \ - -exec rm {} + - - cd "${S}" - dodoc ChangeLog NEWS TODO - newdoc README README.download - cd doc - dodoc HOWTO README* WISHLIST *.txt -} - -pkg_preinst() { - rm -f "${ROOT}"/etc/pam.d/system-auth.new \ - "${ROOT}/etc/login.defs.new" - - use pam && pam_epam_expand "${D}"/etc/pam.d/login -} - -pkg_postinst() { - # Enable shadow groups (we need ROOT=/ here, as grpconv only - # operate on / ...). - if [[ ${ROOT} == / && ! -f /etc/gshadow ]] ; then - if grpck -r 2>/dev/null ; then - grpconv - else - ewarn "Running 'grpck' returned errors. Please run it by hand, and then" - ewarn "run 'grpconv' afterwards!" - fi - fi - - einfo "The 'adduser' symlink to 'useradd' has been dropped." -} diff --git a/sys-apps/shadow/shadow-4.1.4.3.ebuild b/sys-apps/shadow/shadow-4.1.4.3.ebuild deleted file mode 100644 index 89ff7211edc1..000000000000 --- a/sys-apps/shadow/shadow-4.1.4.3.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.4.3.ebuild,v 1.15 2013/03/12 14:19:37 vapier Exp $ - -inherit eutils libtool toolchain-funcs pam multilib - -DESCRIPTION="Utilities to deal with user accounts" -HOMEPAGE="http://shadow.pld.org.pl/ http://pkg-shadow.alioth.debian.org/" -SRC_URI="http://pkg-shadow.alioth.debian.org/releases/${P}.tar.bz2" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="audit cracklib nls pam selinux skey" - -RDEPEND="audit? ( sys-process/audit ) - cracklib? ( >=sys-libs/cracklib-2.7-r3 ) - pam? ( virtual/pam ) - skey? ( sys-auth/skey ) - selinux? ( >=sys-libs/libselinux-1.28 ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" -RDEPEND="${RDEPEND} - pam? ( >=sys-auth/pambase-20080219.1 )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-4.1.4.3-dup-install-targets.patch - epatch "${FILESDIR}"/${PN}-4.1.4.2-env-reset-keep-locale.patch #283725 - epatch "${FILESDIR}"/${PN}-4.1.3-dots-in-usernames.patch #22920 - epatch "${FILESDIR}"/${PN}-4.1.4.2-groupmod-pam-check.patch #300790 - epatch "${FILESDIR}"/${PN}-4.1.4.2-su_no_sanitize_env.patch #301957 - epatch "${FILESDIR}"/${PN}-4.1.4.2-fix-etc-gshadow-reading.patch #327605 - elibtoolize -} - -src_compile() { - tc-is-cross-compiler && export ac_cv_func_setpgrp_void=yes - econf \ - --without-group-name-max-length \ - --enable-shared=no \ - --enable-static=yes \ - $(use_with audit) \ - $(use_with cracklib libcrack) \ - $(use_with pam libpam) \ - $(use_with skey) \ - $(use_with selinux) \ - $(use_enable nls) \ - $(use_with elibc_glibc nscd) - emake || die "compile problem" -} - -set_login_opt() { - local comment="" opt=$1 val=$2 - [[ -z ${val} ]] && comment="#" - sed -i -r \ - -e "/^#?${opt}/s:.*:${comment}${opt} ${val}:" \ - "${D}"/etc/login.defs - local res=$(grep "^${comment}${opt}" "${D}"/etc/login.defs) - einfo ${res:-Unable to find ${opt} in /etc/login.defs} -} - -src_install() { - emake DESTDIR="${D}" suidperms=4711 install || die "install problem" - - # Remove libshadow and libmisc; see bug 37725 and the following - # comment from shadow's README.linux: - # Currently, libshadow.a is for internal use only, so if you see - # -lshadow in a Makefile of some other package, it is safe to - # remove it. - rm -f "${D}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la} - - insinto /etc - # Using a securetty with devfs device names added - # (compat names kept for non-devfs compatibility) - insopts -m0600 ; doins "${FILESDIR}"/securetty - if ! use pam ; then - insopts -m0600 - doins etc/login.access etc/limits - fi - # Output arch-specific cruft - local devs - case $(tc-arch) in - ppc*) devs="hvc0 hvsi0 ttyPSC0";; - hppa) devs="ttyB0";; - arm) devs="ttyFB0 ttySAC0 ttySAC1 ttySAC2 ttySAC3 ttymxc0 ttymxc1 ttyO0 ttyO1 ttyO2";; - sh) devs="ttySC0 ttySC1";; - esac - [[ -n ${devs} ]] && printf '%s\n' ${devs} >> "${D}"/etc/securetty - - # needed for 'useradd -D' - insinto /etc/default - insopts -m0600 - doins "${FILESDIR}"/default/useradd - - # move passwd to / to help recover broke systems #64441 - mv "${D}"/usr/bin/passwd "${D}"/bin/ - dosym /bin/passwd /usr/bin/passwd - - cd "${S}" - insinto /etc - insopts -m0644 - newins etc/login.defs login.defs - - if ! use pam ; then - set_login_opt MAIL_CHECK_ENAB no - set_login_opt SU_WHEEL_ONLY yes - set_login_opt CRACKLIB_DICTPATH /usr/$(get_libdir)/cracklib_dict - set_login_opt LOGIN_RETRIES 3 - set_login_opt ENCRYPT_METHOD SHA512 - else - dopamd "${FILESDIR}/pam.d-include/"{su,shadow} - - newpamd "${FILESDIR}/login.pamd.3" login - - for x in passwd chpasswd chgpasswd; do - newpamd "${FILESDIR}"/pam.d-include/passwd ${x} || die - done - - for x in chage chsh chfn newusers \ - user{add,del,mod} group{add,del,mod} ; do - newpamd "${FILESDIR}"/pam.d-include/shadow ${x} || die - done - - # comment out login.defs options that pam hates - local opt - for opt in \ - CHFN_AUTH \ - CRACKLIB_DICTPATH \ - ENV_HZ \ - ENVIRON_FILE \ - FAILLOG_ENAB \ - FTMP_FILE \ - LASTLOG_ENAB \ - MAIL_CHECK_ENAB \ - MOTD_FILE \ - NOLOGINS_FILE \ - OBSCURE_CHECKS_ENAB \ - PASS_ALWAYS_WARN \ - PASS_CHANGE_TRIES \ - PASS_MIN_LEN \ - PORTTIME_CHECKS_ENAB \ - QUOTAS_ENAB \ - SU_WHEEL_ONLY - do - set_login_opt ${opt} - done - - sed -i -f "${FILESDIR}"/login_defs_pam.sed \ - "${D}"/etc/login.defs - - # remove manpages that pam will install for us - # and/or don't apply when using pam - find "${D}"/usr/share/man \ - '(' -name 'limits.5*' -o -name 'suauth.5*' ')' \ - -exec rm {} + - fi - - # Remove manpages that are handled by other packages - find "${D}"/usr/share/man \ - '(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \ - -exec rm {} + - - cd "${S}" - dodoc ChangeLog NEWS TODO - newdoc README README.download - cd doc - dodoc HOWTO README* WISHLIST *.txt -} - -pkg_preinst() { - rm -f "${ROOT}"/etc/pam.d/system-auth.new \ - "${ROOT}/etc/login.defs.new" - - use pam && pam_epam_expand "${D}"/etc/pam.d/login -} - -pkg_postinst() { - # Enable shadow groups (we need ROOT=/ here, as grpconv only - # operate on / ...). - if [[ ${ROOT} == / && ! -f /etc/gshadow ]] ; then - if grpck -r 2>/dev/null ; then - grpconv - else - ewarn "Running 'grpck' returned errors. Please run it by hand, and then" - ewarn "run 'grpconv' afterwards!" - fi - fi - - einfo "The 'adduser' symlink to 'useradd' has been dropped." -} diff --git a/sys-apps/shadow/shadow-4.1.5-r1.ebuild b/sys-apps/shadow/shadow-4.1.5-r1.ebuild deleted file mode 100644 index d675951429c2..000000000000 --- a/sys-apps/shadow/shadow-4.1.5-r1.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.5-r1.ebuild,v 1.5 2013/03/12 14:19:37 vapier Exp $ - -inherit eutils libtool toolchain-funcs pam multilib - -DESCRIPTION="Utilities to deal with user accounts" -HOMEPAGE="http://shadow.pld.org.pl/ http://pkg-shadow.alioth.debian.org/" -SRC_URI="http://pkg-shadow.alioth.debian.org/releases/${P}.tar.bz2" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="acl audit cracklib nls pam selinux skey xattr" - -RDEPEND="acl? ( sys-apps/acl ) - audit? ( sys-process/audit ) - cracklib? ( >=sys-libs/cracklib-2.7-r3 ) - pam? ( virtual/pam ) - skey? ( sys-auth/skey ) - selinux? ( >=sys-libs/libselinux-1.28 ) - nls? ( virtual/libintl ) - xattr? ( sys-apps/attr )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" -RDEPEND="${RDEPEND} - pam? ( >=sys-auth/pambase-20120417 )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-4.1.3-dots-in-usernames.patch #22920 - epatch "${FILESDIR}"/${PN}-4.1.5-stdarg.patch - epatch "${FILESDIR}"/${PN}-4.1.5-nscd-newline-msg.patch - epatch "${FILESDIR}"/${PN}-4.1.5-nscd-ignore-exit-1.patch - elibtoolize -} - -src_compile() { - tc-is-cross-compiler && export ac_cv_func_setpgrp_void=yes - econf \ - --without-group-name-max-length \ - --without-tcb \ - --enable-shared=no \ - --enable-static=yes \ - $(use_with acl) \ - $(use_with audit) \ - $(use_with cracklib libcrack) \ - $(use_with pam libpam) \ - $(use_with skey) \ - $(use_with selinux) \ - $(use_enable nls) \ - $(use_with elibc_glibc nscd) \ - $(use_with xattr attr) - emake || die -} - -set_login_opt() { - local comment="" opt=$1 val=$2 - [[ -z ${val} ]] && comment="#" - sed -i -r \ - -e "/^#?${opt}/s:.*:${comment}${opt} ${val}:" \ - "${D}"/etc/login.defs - local res=$(grep "^${comment}${opt}" "${D}"/etc/login.defs) - einfo ${res:-Unable to find ${opt} in /etc/login.defs} -} - -src_install() { - emake DESTDIR="${D}" suidperms=4711 install || die - - # Remove libshadow and libmisc; see bug 37725 and the following - # comment from shadow's README.linux: - # Currently, libshadow.a is for internal use only, so if you see - # -lshadow in a Makefile of some other package, it is safe to - # remove it. - rm -f "${D}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la} - - insinto /etc - # Using a securetty with devfs device names added - # (compat names kept for non-devfs compatibility) - insopts -m0600 ; doins "${FILESDIR}"/securetty - if ! use pam ; then - insopts -m0600 - doins etc/login.access etc/limits - fi - # Output arch-specific cruft - local devs - case $(tc-arch) in - ppc*) devs="hvc0 hvsi0 ttyPSC0";; - hppa) devs="ttyB0";; - arm) devs="ttyFB0 ttySAC0 ttySAC1 ttySAC2 ttySAC3 ttymxc0 ttymxc1 ttyO0 ttyO1 ttyO2";; - sh) devs="ttySC0 ttySC1";; - esac - [[ -n ${devs} ]] && printf '%s\n' ${devs} >> "${D}"/etc/securetty - - # needed for 'useradd -D' - insinto /etc/default - insopts -m0600 - doins "${FILESDIR}"/default/useradd - - # move passwd to / to help recover broke systems #64441 - mv "${D}"/usr/bin/passwd "${D}"/bin/ - dosym /bin/passwd /usr/bin/passwd - - cd "${S}" - insinto /etc - insopts -m0644 - newins etc/login.defs login.defs - - if ! use pam ; then - set_login_opt MAIL_CHECK_ENAB no - set_login_opt SU_WHEEL_ONLY yes - set_login_opt CRACKLIB_DICTPATH /usr/$(get_libdir)/cracklib_dict - set_login_opt LOGIN_RETRIES 3 - set_login_opt ENCRYPT_METHOD SHA512 - else - dopamd "${FILESDIR}"/pam.d-include/shadow || die - - for x in chpasswd chgpasswd; do - newpamd "${FILESDIR}"/pam.d-include/passwd ${x} || die - done - - for x in chage chsh chfn newusers \ - user{add,del,mod} group{add,del,mod} ; do - newpamd "${FILESDIR}"/pam.d-include/shadow ${x} || die - done - - # comment out login.defs options that pam hates - local opt - for opt in \ - CHFN_AUTH \ - CRACKLIB_DICTPATH \ - ENV_HZ \ - ENVIRON_FILE \ - FAILLOG_ENAB \ - FTMP_FILE \ - LASTLOG_ENAB \ - MAIL_CHECK_ENAB \ - MOTD_FILE \ - NOLOGINS_FILE \ - OBSCURE_CHECKS_ENAB \ - PASS_ALWAYS_WARN \ - PASS_CHANGE_TRIES \ - PASS_MIN_LEN \ - PORTTIME_CHECKS_ENAB \ - QUOTAS_ENAB \ - SU_WHEEL_ONLY - do - set_login_opt ${opt} - done - - sed -i -f "${FILESDIR}"/login_defs_pam.sed \ - "${D}"/etc/login.defs - - # remove manpages that pam will install for us - # and/or don't apply when using pam - find "${D}"/usr/share/man \ - '(' -name 'limits.5*' -o -name 'suauth.5*' ')' \ - -exec rm {} + - - # Remove pam.d files provided by pambase. - rm "${D}"/etc/pam.d/{login,passwd,su} || die - fi - - # Remove manpages that are handled by other packages - find "${D}"/usr/share/man \ - '(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \ - -exec rm {} + - - cd "${S}" - dodoc ChangeLog NEWS TODO - newdoc README README.download - cd doc - dodoc HOWTO README* WISHLIST *.txt -} - -pkg_preinst() { - rm -f "${ROOT}"/etc/pam.d/system-auth.new \ - "${ROOT}/etc/login.defs.new" - - use pam && pam_epam_expand "${D}"/etc/pam.d/login -} - -pkg_postinst() { - # Enable shadow groups. - if [ ! -f "${ROOT}"/etc/gshadow ] ; then - if grpck -r -R "${ROOT}" 2>/dev/null ; then - grpconv -R "${ROOT}" - else - ewarn "Running 'grpck' returned errors. Please run it by hand, and then" - ewarn "run 'grpconv' afterwards!" - fi - fi - - einfo "The 'adduser' symlink to 'useradd' has been dropped." -} diff --git a/sys-apps/shadow/shadow-4.1.5-r2.ebuild b/sys-apps/shadow/shadow-4.1.5-r2.ebuild deleted file mode 100644 index 05424035be71..000000000000 --- a/sys-apps/shadow/shadow-4.1.5-r2.ebuild +++ /dev/null @@ -1,201 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.5-r2.ebuild,v 1.5 2013/03/12 14:19:37 vapier Exp $ - -inherit eutils libtool toolchain-funcs pam multilib - -DESCRIPTION="Utilities to deal with user accounts" -HOMEPAGE="http://shadow.pld.org.pl/ http://pkg-shadow.alioth.debian.org/" -SRC_URI="http://pkg-shadow.alioth.debian.org/releases/${P}.tar.bz2" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="acl audit cracklib nls pam selinux skey xattr" - -RDEPEND="acl? ( sys-apps/acl ) - audit? ( sys-process/audit ) - cracklib? ( >=sys-libs/cracklib-2.7-r3 ) - pam? ( virtual/pam ) - skey? ( sys-auth/skey ) - selinux? ( - >=sys-libs/libselinux-1.28 - sys-libs/libsemanage - ) - nls? ( virtual/libintl ) - xattr? ( sys-apps/attr )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" -RDEPEND="${RDEPEND} - pam? ( >=sys-auth/pambase-20120417 )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-4.1.3-dots-in-usernames.patch #22920 - epatch "${FILESDIR}"/${PN}-4.1.5-stdarg.patch - epatch "${FILESDIR}"/${PN}-4.1.5-nscd-newline-msg.patch - epatch "${FILESDIR}"/${PN}-4.1.5-nscd-ignore-exit-1.patch - epatch "${FILESDIR}"/${PN}-4.1.5-grremove.patch #405409 - epatch "${FILESDIR}"/${PN}-4.1.5-selinux-groupadd.patch #406819 - elibtoolize -} - -src_compile() { - tc-is-cross-compiler && export ac_cv_func_setpgrp_void=yes - econf \ - --without-group-name-max-length \ - --without-tcb \ - --enable-shared=no \ - --enable-static=yes \ - $(use_with acl) \ - $(use_with audit) \ - $(use_with cracklib libcrack) \ - $(use_with pam libpam) \ - $(use_with skey) \ - $(use_with selinux) \ - $(use_enable nls) \ - $(use_with elibc_glibc nscd) \ - $(use_with xattr attr) - emake || die -} - -set_login_opt() { - local comment="" opt=$1 val=$2 - [[ -z ${val} ]] && comment="#" - sed -i -r \ - -e "/^#?${opt}/s:.*:${comment}${opt} ${val}:" \ - "${D}"/etc/login.defs - local res=$(grep "^${comment}${opt}" "${D}"/etc/login.defs) - einfo ${res:-Unable to find ${opt} in /etc/login.defs} -} - -src_install() { - emake DESTDIR="${D}" suidperms=4711 install || die - - # Remove libshadow and libmisc; see bug 37725 and the following - # comment from shadow's README.linux: - # Currently, libshadow.a is for internal use only, so if you see - # -lshadow in a Makefile of some other package, it is safe to - # remove it. - rm -f "${D}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la} - - insinto /etc - # Using a securetty with devfs device names added - # (compat names kept for non-devfs compatibility) - insopts -m0600 ; doins "${FILESDIR}"/securetty - if ! use pam ; then - insopts -m0600 - doins etc/login.access etc/limits - fi - # Output arch-specific cruft - local devs - case $(tc-arch) in - ppc*) devs="hvc0 hvsi0 ttyPSC0";; - hppa) devs="ttyB0";; - arm) devs="ttyFB0 ttySAC0 ttySAC1 ttySAC2 ttySAC3 ttymxc0 ttymxc1 ttyO0 ttyO1 ttyO2";; - sh) devs="ttySC0 ttySC1";; - esac - [[ -n ${devs} ]] && printf '%s\n' ${devs} >> "${D}"/etc/securetty - - # needed for 'useradd -D' - insinto /etc/default - insopts -m0600 - doins "${FILESDIR}"/default/useradd - - # move passwd to / to help recover broke systems #64441 - mv "${D}"/usr/bin/passwd "${D}"/bin/ - dosym /bin/passwd /usr/bin/passwd - - cd "${S}" - insinto /etc - insopts -m0644 - newins etc/login.defs login.defs - - if ! use pam ; then - set_login_opt MAIL_CHECK_ENAB no - set_login_opt SU_WHEEL_ONLY yes - set_login_opt CRACKLIB_DICTPATH /usr/$(get_libdir)/cracklib_dict - set_login_opt LOGIN_RETRIES 3 - set_login_opt ENCRYPT_METHOD SHA512 - else - dopamd "${FILESDIR}"/pam.d-include/shadow || die - - for x in chpasswd chgpasswd; do - newpamd "${FILESDIR}"/pam.d-include/passwd ${x} || die - done - - for x in chage chsh chfn newusers \ - user{add,del,mod} group{add,del,mod} ; do - newpamd "${FILESDIR}"/pam.d-include/shadow ${x} || die - done - - # comment out login.defs options that pam hates - local opt - for opt in \ - CHFN_AUTH \ - CRACKLIB_DICTPATH \ - ENV_HZ \ - ENVIRON_FILE \ - FAILLOG_ENAB \ - FTMP_FILE \ - LASTLOG_ENAB \ - MAIL_CHECK_ENAB \ - MOTD_FILE \ - NOLOGINS_FILE \ - OBSCURE_CHECKS_ENAB \ - PASS_ALWAYS_WARN \ - PASS_CHANGE_TRIES \ - PASS_MIN_LEN \ - PORTTIME_CHECKS_ENAB \ - QUOTAS_ENAB \ - SU_WHEEL_ONLY - do - set_login_opt ${opt} - done - - sed -i -f "${FILESDIR}"/login_defs_pam.sed \ - "${D}"/etc/login.defs - - # remove manpages that pam will install for us - # and/or don't apply when using pam - find "${D}"/usr/share/man \ - '(' -name 'limits.5*' -o -name 'suauth.5*' ')' \ - -exec rm {} + - - # Remove pam.d files provided by pambase. - rm "${D}"/etc/pam.d/{login,passwd,su} || die - fi - - # Remove manpages that are handled by other packages - find "${D}"/usr/share/man \ - '(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \ - -exec rm {} + - - cd "${S}" - dodoc ChangeLog NEWS TODO - newdoc README README.download - cd doc - dodoc HOWTO README* WISHLIST *.txt -} - -pkg_preinst() { - rm -f "${ROOT}"/etc/pam.d/system-auth.new \ - "${ROOT}/etc/login.defs.new" - - use pam && pam_epam_expand "${D}"/etc/pam.d/login -} - -pkg_postinst() { - # Enable shadow groups. - if [ ! -f "${ROOT}"/etc/gshadow ] ; then - if grpck -r -R "${ROOT}" 2>/dev/null ; then - grpconv -R "${ROOT}" - else - ewarn "Running 'grpck' returned errors. Please run it by hand, and then" - ewarn "run 'grpconv' afterwards!" - fi - fi - - einfo "The 'adduser' symlink to 'useradd' has been dropped." -} diff --git a/sys-apps/shadow/shadow-4.1.5.1-r1.ebuild b/sys-apps/shadow/shadow-4.1.5.1-r1.ebuild index c98a485e0cac..c9045903cb2d 100644 --- a/sys-apps/shadow/shadow-4.1.5.1-r1.ebuild +++ b/sys-apps/shadow/shadow-4.1.5.1-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.5.1-r1.ebuild,v 1.14 2013/09/15 19:11:22 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.5.1-r1.ebuild,v 1.15 2014/01/07 09:12:01 polynomial-c Exp $ -EAPI="2" +EAPI=4 inherit eutils libtool toolchain-funcs pam multilib @@ -67,7 +67,7 @@ set_login_opt() { } src_install() { - emake DESTDIR="${D}" suidperms=4711 install || die + emake DESTDIR="${D}" suidperms=4711 install # Remove libshadow and libmisc; see bug 37725 and the following # comment from shadow's README.linux: @@ -115,15 +115,15 @@ src_install() { set_login_opt LOGIN_RETRIES 3 set_login_opt ENCRYPT_METHOD SHA512 else - dopamd "${FILESDIR}"/pam.d-include/shadow || die + dopamd "${FILESDIR}"/pam.d-include/shadow for x in chpasswd chgpasswd newusers; do - newpamd "${FILESDIR}"/pam.d-include/passwd ${x} || die + newpamd "${FILESDIR}"/pam.d-include/passwd ${x} done for x in chage chsh chfn \ user{add,del,mod} group{add,del,mod} ; do - newpamd "${FILESDIR}"/pam.d-include/shadow ${x} || die + newpamd "${FILESDIR}"/pam.d-include/shadow ${x} done # comment out login.defs options that pam hates diff --git a/sys-apps/shadow/shadow-4.1.5.1.ebuild b/sys-apps/shadow/shadow-4.1.5.1.ebuild deleted file mode 100644 index 110218efec6b..000000000000 --- a/sys-apps/shadow/shadow-4.1.5.1.ebuild +++ /dev/null @@ -1,197 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.5.1.ebuild,v 1.4 2013/03/12 14:19:37 vapier Exp $ - -EAPI="2" - -inherit eutils libtool toolchain-funcs pam multilib - -DESCRIPTION="Utilities to deal with user accounts" -HOMEPAGE="http://shadow.pld.org.pl/ http://pkg-shadow.alioth.debian.org/" -SRC_URI="http://pkg-shadow.alioth.debian.org/releases/${P}.tar.bz2" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="acl audit cracklib nls pam selinux skey xattr" - -RDEPEND="acl? ( sys-apps/acl ) - audit? ( sys-process/audit ) - cracklib? ( >=sys-libs/cracklib-2.7-r3 ) - pam? ( virtual/pam ) - skey? ( sys-auth/skey ) - selinux? ( - >=sys-libs/libselinux-1.28 - sys-libs/libsemanage - ) - nls? ( virtual/libintl ) - xattr? ( sys-apps/attr )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" -RDEPEND="${RDEPEND} - pam? ( >=sys-auth/pambase-20120417 )" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-4.1.3-dots-in-usernames.patch #22920 - epatch_user - elibtoolize -} - -src_configure() { - tc-is-cross-compiler && export ac_cv_func_setpgrp_void=yes - econf \ - --without-group-name-max-length \ - --without-tcb \ - --enable-shared=no \ - --enable-static=yes \ - $(use_with acl) \ - $(use_with audit) \ - $(use_with cracklib libcrack) \ - $(use_with pam libpam) \ - $(use_with skey) \ - $(use_with selinux) \ - $(use_enable nls) \ - $(use_with elibc_glibc nscd) \ - $(use_with xattr attr) - has_version 'sys-libs/uclibc[-rpc]' && sed -i '/RLOGIN/d' config.h #425052 -} - -set_login_opt() { - local comment="" opt=$1 val=$2 - [[ -z ${val} ]] && comment="#" - sed -i -r \ - -e "/^#?${opt}/s:.*:${comment}${opt} ${val}:" \ - "${D}"/etc/login.defs - local res=$(grep "^${comment}${opt}" "${D}"/etc/login.defs) - einfo ${res:-Unable to find ${opt} in /etc/login.defs} -} - -src_install() { - emake DESTDIR="${D}" suidperms=4711 install || die - - # Remove libshadow and libmisc; see bug 37725 and the following - # comment from shadow's README.linux: - # Currently, libshadow.a is for internal use only, so if you see - # -lshadow in a Makefile of some other package, it is safe to - # remove it. - rm -f "${D}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la} - - insinto /etc - # Using a securetty with devfs device names added - # (compat names kept for non-devfs compatibility) - insopts -m0600 ; doins "${FILESDIR}"/securetty - if ! use pam ; then - insopts -m0600 - doins etc/login.access etc/limits - fi - # Output arch-specific cruft - local devs - case $(tc-arch) in - ppc*) devs="hvc0 hvsi0 ttyPSC0";; - hppa) devs="ttyB0";; - arm) devs="ttyFB0 ttySAC0 ttySAC1 ttySAC2 ttySAC3 ttymxc0 ttymxc1 ttyO0 ttyO1 ttyO2";; - sh) devs="ttySC0 ttySC1";; - esac - [[ -n ${devs} ]] && printf '%s\n' ${devs} >> "${D}"/etc/securetty - - # needed for 'useradd -D' - insinto /etc/default - insopts -m0600 - doins "${FILESDIR}"/default/useradd - - # move passwd to / to help recover broke systems #64441 - mv "${D}"/usr/bin/passwd "${D}"/bin/ - dosym /bin/passwd /usr/bin/passwd - - cd "${S}" - insinto /etc - insopts -m0644 - newins etc/login.defs login.defs - - if ! use pam ; then - set_login_opt MAIL_CHECK_ENAB no - set_login_opt SU_WHEEL_ONLY yes - set_login_opt CRACKLIB_DICTPATH /usr/$(get_libdir)/cracklib_dict - set_login_opt LOGIN_RETRIES 3 - set_login_opt ENCRYPT_METHOD SHA512 - else - dopamd "${FILESDIR}"/pam.d-include/shadow || die - - for x in chpasswd chgpasswd; do - newpamd "${FILESDIR}"/pam.d-include/passwd ${x} || die - done - - for x in chage chsh chfn newusers \ - user{add,del,mod} group{add,del,mod} ; do - newpamd "${FILESDIR}"/pam.d-include/shadow ${x} || die - done - - # comment out login.defs options that pam hates - local opt - for opt in \ - CHFN_AUTH \ - CRACKLIB_DICTPATH \ - ENV_HZ \ - ENVIRON_FILE \ - FAILLOG_ENAB \ - FTMP_FILE \ - LASTLOG_ENAB \ - MAIL_CHECK_ENAB \ - MOTD_FILE \ - NOLOGINS_FILE \ - OBSCURE_CHECKS_ENAB \ - PASS_ALWAYS_WARN \ - PASS_CHANGE_TRIES \ - PASS_MIN_LEN \ - PORTTIME_CHECKS_ENAB \ - QUOTAS_ENAB \ - SU_WHEEL_ONLY - do - set_login_opt ${opt} - done - - sed -i -f "${FILESDIR}"/login_defs_pam.sed \ - "${D}"/etc/login.defs - - # remove manpages that pam will install for us - # and/or don't apply when using pam - find "${D}"/usr/share/man \ - '(' -name 'limits.5*' -o -name 'suauth.5*' ')' \ - -exec rm {} + - - # Remove pam.d files provided by pambase. - rm "${D}"/etc/pam.d/{login,passwd,su} || die - fi - - # Remove manpages that are handled by other packages - find "${D}"/usr/share/man \ - '(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \ - -exec rm {} + - - cd "${S}" - dodoc ChangeLog NEWS TODO - newdoc README README.download - cd doc - dodoc HOWTO README* WISHLIST *.txt -} - -pkg_preinst() { - rm -f "${ROOT}"/etc/pam.d/system-auth.new \ - "${ROOT}/etc/login.defs.new" - - use pam && pam_epam_expand "${D}"/etc/pam.d/login -} - -pkg_postinst() { - # Enable shadow groups. - if [ ! -f "${ROOT}"/etc/gshadow ] ; then - if grpck -r -R "${ROOT}" 2>/dev/null ; then - grpconv -R "${ROOT}" - else - ewarn "Running 'grpck' returned errors. Please run it by hand, and then" - ewarn "run 'grpconv' afterwards!" - fi - fi - - einfo "The 'adduser' symlink to 'useradd' has been dropped." -} diff --git a/sys-apps/shadow/shadow-4.1.5.ebuild b/sys-apps/shadow/shadow-4.1.5.ebuild deleted file mode 100644 index 81ab54f6cde4..000000000000 --- a/sys-apps/shadow/shadow-4.1.5.ebuild +++ /dev/null @@ -1,195 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/shadow/shadow-4.1.5.ebuild,v 1.7 2013/03/12 14:19:37 vapier Exp $ - -inherit eutils libtool toolchain-funcs pam multilib - -DESCRIPTION="Utilities to deal with user accounts" -HOMEPAGE="http://shadow.pld.org.pl/ http://pkg-shadow.alioth.debian.org/" -SRC_URI="http://pkg-shadow.alioth.debian.org/releases/${P}.tar.bz2" - -LICENSE="BSD GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="acl audit cracklib nls pam selinux skey xattr" - -RDEPEND="acl? ( sys-apps/acl ) - audit? ( sys-process/audit ) - cracklib? ( >=sys-libs/cracklib-2.7-r3 ) - pam? ( virtual/pam ) - skey? ( sys-auth/skey ) - selinux? ( >=sys-libs/libselinux-1.28 ) - nls? ( virtual/libintl ) - xattr? ( sys-apps/attr )" -DEPEND="${RDEPEND} - nls? ( sys-devel/gettext )" -RDEPEND="${RDEPEND} - pam? ( >=sys-auth/pambase-20080219.1 )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${PN}-4.1.3-dots-in-usernames.patch #22920 - epatch "${FILESDIR}"/${PN}-4.1.5-stdarg.patch - epatch "${FILESDIR}"/${PN}-4.1.5-nscd-newline-msg.patch - epatch "${FILESDIR}"/${PN}-4.1.5-nscd-ignore-exit-1.patch - elibtoolize -} - -src_compile() { - tc-is-cross-compiler && export ac_cv_func_setpgrp_void=yes - econf \ - --without-group-name-max-length \ - --without-tcb \ - --enable-shared=no \ - --enable-static=yes \ - $(use_with acl) \ - $(use_with audit) \ - $(use_with cracklib libcrack) \ - $(use_with pam libpam) \ - $(use_with skey) \ - $(use_with selinux) \ - $(use_enable nls) \ - $(use_with elibc_glibc nscd) \ - $(use_with xattr attr) - emake || die -} - -set_login_opt() { - local comment="" opt=$1 val=$2 - [[ -z ${val} ]] && comment="#" - sed -i -r \ - -e "/^#?${opt}/s:.*:${comment}${opt} ${val}:" \ - "${D}"/etc/login.defs - local res=$(grep "^${comment}${opt}" "${D}"/etc/login.defs) - einfo ${res:-Unable to find ${opt} in /etc/login.defs} -} - -src_install() { - emake DESTDIR="${D}" suidperms=4711 install || die - - # Remove libshadow and libmisc; see bug 37725 and the following - # comment from shadow's README.linux: - # Currently, libshadow.a is for internal use only, so if you see - # -lshadow in a Makefile of some other package, it is safe to - # remove it. - rm -f "${D}"/{,usr/}$(get_libdir)/lib{misc,shadow}.{a,la} - - insinto /etc - # Using a securetty with devfs device names added - # (compat names kept for non-devfs compatibility) - insopts -m0600 ; doins "${FILESDIR}"/securetty - if ! use pam ; then - insopts -m0600 - doins etc/login.access etc/limits - fi - # Output arch-specific cruft - local devs - case $(tc-arch) in - ppc*) devs="hvc0 hvsi0 ttyPSC0";; - hppa) devs="ttyB0";; - arm) devs="ttyFB0 ttySAC0 ttySAC1 ttySAC2 ttySAC3 ttymxc0 ttymxc1 ttyO0 ttyO1 ttyO2";; - sh) devs="ttySC0 ttySC1";; - esac - [[ -n ${devs} ]] && printf '%s\n' ${devs} >> "${D}"/etc/securetty - - # needed for 'useradd -D' - insinto /etc/default - insopts -m0600 - doins "${FILESDIR}"/default/useradd - - # move passwd to / to help recover broke systems #64441 - mv "${D}"/usr/bin/passwd "${D}"/bin/ - dosym /bin/passwd /usr/bin/passwd - - cd "${S}" - insinto /etc - insopts -m0644 - newins etc/login.defs login.defs - - if ! use pam ; then - set_login_opt MAIL_CHECK_ENAB no - set_login_opt SU_WHEEL_ONLY yes - set_login_opt CRACKLIB_DICTPATH /usr/$(get_libdir)/cracklib_dict - set_login_opt LOGIN_RETRIES 3 - set_login_opt ENCRYPT_METHOD SHA512 - else - dopamd "${FILESDIR}/pam.d-include/"{su,shadow} - - newpamd "${FILESDIR}/login.pamd.3" login - - for x in passwd chpasswd chgpasswd; do - newpamd "${FILESDIR}"/pam.d-include/passwd ${x} || die - done - - for x in chage chsh chfn newusers \ - user{add,del,mod} group{add,del,mod} ; do - newpamd "${FILESDIR}"/pam.d-include/shadow ${x} || die - done - - # comment out login.defs options that pam hates - local opt - for opt in \ - CHFN_AUTH \ - CRACKLIB_DICTPATH \ - ENV_HZ \ - ENVIRON_FILE \ - FAILLOG_ENAB \ - FTMP_FILE \ - LASTLOG_ENAB \ - MAIL_CHECK_ENAB \ - MOTD_FILE \ - NOLOGINS_FILE \ - OBSCURE_CHECKS_ENAB \ - PASS_ALWAYS_WARN \ - PASS_CHANGE_TRIES \ - PASS_MIN_LEN \ - PORTTIME_CHECKS_ENAB \ - QUOTAS_ENAB \ - SU_WHEEL_ONLY - do - set_login_opt ${opt} - done - - sed -i -f "${FILESDIR}"/login_defs_pam.sed \ - "${D}"/etc/login.defs - - # remove manpages that pam will install for us - # and/or don't apply when using pam - find "${D}"/usr/share/man \ - '(' -name 'limits.5*' -o -name 'suauth.5*' ')' \ - -exec rm {} + - fi - - # Remove manpages that are handled by other packages - find "${D}"/usr/share/man \ - '(' -name id.1 -o -name passwd.5 -o -name getspnam.3 ')' \ - -exec rm {} + - - cd "${S}" - dodoc ChangeLog NEWS TODO - newdoc README README.download - cd doc - dodoc HOWTO README* WISHLIST *.txt -} - -pkg_preinst() { - rm -f "${ROOT}"/etc/pam.d/system-auth.new \ - "${ROOT}/etc/login.defs.new" - - use pam && pam_epam_expand "${D}"/etc/pam.d/login -} - -pkg_postinst() { - # Enable shadow groups. - if [ ! -f "${ROOT}"/etc/gshadow ] ; then - if grpck -r -R "${ROOT}" 2>/dev/null ; then - grpconv -R "${ROOT}" - else - ewarn "Running 'grpck' returned errors. Please run it by hand, and then" - ewarn "run 'grpconv' afterwards!" - fi - fi - - einfo "The 'adduser' symlink to 'useradd' has been dropped." -} |