From 78f74ee273c66492567589961b19f05f6477d2bb Mon Sep 17 00:00:00 2001 From: CentOS Buildsys Date: Feb 12 2014 14:06:17 +0000 Subject: import shadow-utils-4.1.5.1-13.el7.src.rpm --- diff --git a/SOURCES/shadow-4.1.5.1-manfix.patch b/SOURCES/shadow-4.1.5.1-manfix.patch index c66d7c9..00b792f 100644 --- a/SOURCES/shadow-4.1.5.1-manfix.patch +++ b/SOURCES/shadow-4.1.5.1-manfix.patch @@ -1,6 +1,148 @@ +diff -up shadow-4.1.5.1/man/login.defs.5.xml.manfix shadow-4.1.5.1/man/login.defs.5.xml +--- shadow-4.1.5.1/man/login.defs.5.xml.manfix 2012-05-25 13:45:28.000000000 +0200 ++++ shadow-4.1.5.1/man/login.defs.5.xml 2014-02-12 11:18:36.126334872 +0100 +@@ -160,6 +160,17 @@ + long numeric parameters is machine-dependent. + + ++ ++ Please note that the parameters in this configuration file control the ++ behavior of the tools from the shadow-utils component. None of these ++ tools uses the PAM mechanism, and the utilities that use PAM (such as the ++ passwd command) should be configured elsewhere. The only values that ++ affect PAM modules are ENCRYPT_METHOD and SHA_CRYPT_MAX_ROUNDS ++ for pam_unix module, FAIL_DELAY for pam_faildelay module, ++ and UMASK for pam_umask module. Refer to ++ pam(8) for more information. ++ ++ + The following configuration items are provided: + + +diff -up shadow-4.1.5.1/man/man5/login.defs.5.manfix shadow-4.1.5.1/man/man5/login.defs.5 +--- shadow-4.1.5.1/man/man5/login.defs.5.manfix 2012-05-25 13:59:03.000000000 +0200 ++++ shadow-4.1.5.1/man/man5/login.defs.5 2014-02-12 11:26:27.159851843 +0100 +@@ -46,6 +46,14 @@ value\&. Numbers (both regular and long) + \fI0\fR) or hexadecimal values (precede the value with + \fI0x\fR)\&. The maximum value of the regular and long numeric parameters is machine\-dependent\&. + .PP ++Please note that the parameters in this configuration file control the ++behavior of the tools from the shadow-utils component\&. None of these ++tools uses the PAM mechanism, and the utilities that use PAM (such as the ++passwd command) should be configured elsewhere\&. The only values that ++affect PAM modules are \fBENCRYPT_METHOD\fR and \fBSHA_CRYPT_MAX_ROUNDS\fR for pam_unix module, ++\fBFAIL_DELAY\fR for pam_faildelay module, and \fBUMASK\fR for pam_umask module\&. Refer to ++pam(8) for more information\&. ++.PP + The following configuration items are provided: + .PP + \fBCHFN_AUTH\fR (boolean) +@@ -625,20 +633,6 @@ will create by default a group with the + .PP + The following cross references show which programs in the shadow password suite use which parameters\&. + .PP +-chfn +-.RS 4 +- +-CHFN_AUTH +-CHFN_RESTRICT +-LOGIN_STRING +-.RE +-.PP +-chgpasswd +-.RS 4 +-ENCRYPT_METHOD MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB +-SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS +-.RE +-.PP + chpasswd + .RS 4 + +@@ -646,11 +640,6 @@ ENCRYPT_METHOD MD5_CRYPT_ENAB + SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS + .RE + .PP +-chsh +-.RS 4 +-CHSH_AUTH LOGIN_STRING +-.RE +-.PP + gpasswd + .RS 4 + ENCRYPT_METHOD MAX_MEMBERS_PER_GROUP MD5_CRYPT_ENAB +@@ -692,29 +681,6 @@ grpunconv + MAX_MEMBERS_PER_GROUP + .RE + .PP +-login +-.RS 4 +- +-CONSOLE +-CONSOLE_GROUPS DEFAULT_HOME +-ENV_HZ ENV_PATH ENV_SUPATH ENV_TZ ENVIRON_FILE +-ERASECHAR FAIL_DELAY +-FAILLOG_ENAB +-FAKE_SHELL +-FTMP_FILE +-HUSHLOGIN_FILE +-ISSUE_FILE +-KILLCHAR +-LASTLOG_ENAB +-LOGIN_RETRIES +-LOGIN_STRING +-LOGIN_TIMEOUT LOG_OK_LOGINS LOG_UNKFAIL_ENAB +-MAIL_CHECK_ENAB MAIL_DIR MAIL_FILE MOTD_FILE NOLOGINS_FILE PORTTIME_CHECKS_ENAB QUOTAS_ENAB +-TTYGROUP TTYPERM TTYTYPE_FILE +-ULIMIT UMASK +-USERGROUPS_ENAB +-.RE +-.PP + newgrp / sg + .RS 4 + SYSLOG_SG_ENAB +@@ -727,12 +693,6 @@ SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUND + SYS_GID_MAX SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN UID_MAX UID_MIN UMASK + .RE + .PP +-passwd +-.RS 4 +-ENCRYPT_METHOD MD5_CRYPT_ENAB OBSCURE_CHECKS_ENAB PASS_ALWAYS_WARN PASS_CHANGE_TRIES PASS_MAX_LEN PASS_MIN_LEN +-SHA_CRYPT_MAX_ROUNDS SHA_CRYPT_MIN_ROUNDS +-.RE +-.PP + pwck + .RS 4 + PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE +@@ -743,26 +703,6 @@ pwconv + PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE + .RE + .PP +-su +-.RS 4 +- +-CONSOLE +-CONSOLE_GROUPS DEFAULT_HOME +-ENV_HZ ENVIRON_FILE +-ENV_PATH ENV_SUPATH +-ENV_TZ LOGIN_STRING MAIL_CHECK_ENAB MAIL_DIR MAIL_FILE QUOTAS_ENAB +-SULOG_FILE SU_NAME +-SU_WHEEL_ONLY +-SYSLOG_SU_ENAB +-USERGROUPS_ENAB +-.RE +-.PP +-sulogin +-.RS 4 +-ENV_HZ +-ENV_TZ +-.RE +-.PP + useradd + .RS 4 + CREATE_HOME GID_MAX GID_MIN MAIL_DIR MAX_MEMBERS_PER_GROUP PASS_MAX_DAYS PASS_MIN_DAYS PASS_WARN_AGE SYS_GID_MAX SYS_GID_MIN SYS_UID_MAX SYS_UID_MIN UID_MAX UID_MIN UMASK diff -up shadow-4.1.5.1/man/man8/useradd.8.manfix shadow-4.1.5.1/man/man8/useradd.8 ---- shadow-4.1.5.1/man/man8/useradd.8.manfix 2013-07-25 10:39:00.000000000 +0200 -+++ shadow-4.1.5.1/man/man8/useradd.8 2013-10-18 16:29:41.003281715 +0200 +--- shadow-4.1.5.1/man/man8/useradd.8.manfix 2013-11-27 10:25:34.740049650 +0100 ++++ shadow-4.1.5.1/man/man8/useradd.8 2013-11-27 10:25:34.758050045 +0100 @@ -85,7 +85,7 @@ by default\&. Any text string\&. It is generally a short description of the login, and is currently used as the field for the user\*(Aqs full name\&. .RE @@ -26,8 +168,8 @@ diff -up shadow-4.1.5.1/man/man8/useradd.8.manfix shadow-4.1.5.1/man/man8/userad Do not create the user\*(Aqs home directory, even if the system wide setting from /etc/login\&.defs diff -up shadow-4.1.5.1/man/useradd.8.xml.manfix shadow-4.1.5.1/man/useradd.8.xml ---- shadow-4.1.5.1/man/useradd.8.xml.manfix 2013-07-25 10:39:00.115637664 +0200 -+++ shadow-4.1.5.1/man/useradd.8.xml 2013-10-18 16:22:13.151437562 +0200 +--- shadow-4.1.5.1/man/useradd.8.xml.manfix 2013-11-27 10:25:34.740049650 +0100 ++++ shadow-4.1.5.1/man/useradd.8.xml 2013-11-27 10:25:34.759050067 +0100 @@ -161,7 +161,7 @@ diff --git a/SOURCES/shadow-4.1.5.1-userdel-helpfix.patch b/SOURCES/shadow-4.1.5.1-userdel-helpfix.patch new file mode 100644 index 0000000..b79baee --- /dev/null +++ b/SOURCES/shadow-4.1.5.1-userdel-helpfix.patch @@ -0,0 +1,15 @@ +diff -up shadow-4.1.5.1/src/userdel.c.userdel shadow-4.1.5.1/src/userdel.c +--- shadow-4.1.5.1/src/userdel.c.userdel 2012-05-25 13:51:55.000000000 +0200 ++++ shadow-4.1.5.1/src/userdel.c 2014-02-12 11:40:30.707686132 +0100 +@@ -130,8 +130,9 @@ static void usage (int status) + "\n" + "Options:\n"), + Prog); +- (void) fputs (_(" -f, --force force removal of files,\n" +- " even if not owned by user\n"), ++ (void) fputs (_(" -f, --force force some actions that would fail otherwise\n" ++ " e.g. removal of user still logged in\n" ++ " or files, even if not owned by the user\n"), + usageout); + (void) fputs (_(" -h, --help display this help message and exit\n"), usageout); + (void) fputs (_(" -r, --remove remove home directory and mail spool\n"), usageout); diff --git a/SPECS/shadow-utils.spec b/SPECS/shadow-utils.spec index cf80b64..bafe53c 100644 --- a/SPECS/shadow-utils.spec +++ b/SPECS/shadow-utils.spec @@ -1,7 +1,7 @@ Summary: Utilities for managing accounts and shadow password files Name: shadow-utils Version: 4.1.5.1 -Release: 9%{?dist} +Release: 13%{?dist} Epoch: 2 URL: http://pkg-shadow.alioth.debian.org/ Source0: http://pkg-shadow.alioth.debian.org/releases/shadow-%{version}.tar.bz2 @@ -23,6 +23,7 @@ Patch13: shadow-4.1.5.1-audit-owner.patch Patch14: shadow-4.1.5.1-default-range.patch Patch15: shadow-4.1.5.1-manfix.patch Patch16: shadow-4.1.5.1-crypt-null.patch +Patch17: shadow-4.1.5.1-userdel-helpfix.patch License: BSD and GPLv2+ Group: System Environment/Base @@ -67,6 +68,7 @@ are used for managing group accounts. %patch14 -p1 -b .default-range %patch15 -p1 -b .manfix %patch16 -p1 -b .crypt-null +%patch17 -p1 -b .userdel iconv -f ISO88591 -t utf-8 doc/HOWTO > doc/HOWTO.utf8 cp -f doc/HOWTO.utf8 doc/HOWTO @@ -220,6 +222,16 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man8/vigr.8* %changelog +* Wed Feb 12 2014 Tomas Mraz - 2:4.1.5.1-13 +- clean up login.defs manpage +- properly document userdel -f behavior + +* Fri Jan 24 2014 Daniel Mach - 2:4.1.5.1-11 +- Mass rebuild 2014-01-24 + +* Fri Dec 27 2013 Daniel Mach - 2:4.1.5.1-10 +- Mass rebuild 2013-12-27 + * Fri Oct 18 2013 Tomas Mraz - 2:4.1.5.1-9 - document that the directory where user's home is created must exist