From 223c5c62d62b8c876714b93cc0b46739e5c91485 Mon Sep 17 00:00:00 2001 From: guoxiaoqi Date: Mon, 13 Jan 2020 14:40:57 +0800 Subject: [PATCH] update config --- shadow-utils.login.defs | 17 ++--------------- shadow-utils.useradd | 1 - shadow.spec | 24 ++++-------------------- 3 files changed, 6 insertions(+), 36 deletions(-) diff --git a/shadow-utils.login.defs b/shadow-utils.login.defs index 3f27f88..a898776 100644 --- a/shadow-utils.login.defs +++ b/shadow-utils.login.defs @@ -1,11 +1,3 @@ -# -# 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 therefore be configured elsewhere. Refer to -# /etc/pam.d/system-auth for more information. -# - # *REQUIRED* # Directory where mailboxes reside, _or_ name of file, relative to the # home directory. If you _do_ define both, MAIL_DIR takes precedence. @@ -45,13 +37,6 @@ GID_MAX 60000 SYS_GID_MIN 201 SYS_GID_MAX 999 -# -# 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 - # # If useradd should create home directories for users by default # On RH systems, we do. This option is overridden with the -m flag on @@ -70,3 +55,5 @@ USERGROUPS_ENAB yes # Use SHA512 to encrypt password. ENCRYPT_METHOD SHA512 +# This sets the root PATH for login +ALWAYS_SET_PATH yes diff --git a/shadow-utils.useradd b/shadow-utils.useradd index 4e81146..a7db290 100644 --- a/shadow-utils.useradd +++ b/shadow-utils.useradd @@ -2,7 +2,6 @@ GROUP=100 HOME=/home INACTIVE=-1 -EXPIRE= SHELL=/bin/bash SKEL=/etc/skel CREATE_MAIL_SPOOL=yes diff --git a/shadow.spec b/shadow.spec index 115cc2b..29e4b20 100644 --- a/shadow.spec +++ b/shadow.spec @@ -1,6 +1,6 @@ Name: shadow Version: 4.7 -Release: 3 +Release: 4 Epoch: 2 License: BSD and GPLv2+ Summary: Tools for managing accounts and shadow password files @@ -11,25 +11,6 @@ Source2: shadow-utils.useradd Source3: shadow-utils.login.defs Source4: shadow-bsd.txt Source5: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt -#follow patches 0-33 come from fedora -Patch0: shadow-4.6-redhat.patch -Patch1: shadow-4.5-goodname.patch -Patch2: shadow-4.1.5.1-info-parent-dir.patch -Patch6: shadow-4.6-selinux.patch -Patch10: shadow-4.6-orig-context.patch -Patch11: shadow-4.1.5.1-logmsg.patch -Patch14: shadow-4.1.5.1-default-range.patch -Patch15: shadow-4.3.1-manfix.patch -Patch17: shadow-4.1.5.1-userdel-helpfix.patch -Patch19: shadow-4.2.1-date-parsing.patch -Patch21: shadow-4.6-move-home.patch -Patch22: shadow-4.6-audit-update.patch -Patch23: shadow-4.5-usermod-unlock.patch -Patch28: shadow-4.3.1-selinux-perms.patch -Patch29: shadow-4.2.1-null-tm.patch -Patch31: shadow-4.6-getenforce.patch -Patch32: shadow-4.5-crypt_h.patch -Patch33: shadow-4.5-long-entry.patch Patch9000: shadow-4.1.5.1-var-lock.patch Patch9001: shadow-utils-fix-lock-file-residue.patch Patch9002: shadow-utils-fix-invalid-path.patch @@ -181,6 +162,9 @@ done %{_mandir}/*/* %changelog +* Sun Jan 12 2020 openEuler Buildteam - 2:4.7-4 +- Delete unused patch + * Thu Dec 19 2019 openEuler Buildteam - 2:4.7-3 - Delete unused infomation -- Gitee