diff --git a/SOURCES/shadow-4.5-goodname.patch b/SOURCES/shadow-4.6-goodname.patch similarity index 64% rename from SOURCES/shadow-4.5-goodname.patch rename to SOURCES/shadow-4.6-goodname.patch index 2f82828..13b5f75 100644 --- a/SOURCES/shadow-4.5-goodname.patch +++ b/SOURCES/shadow-4.6-goodname.patch @@ -1,13 +1,9 @@ -Index: shadow-4.5/libmisc/chkname.c -=================================================================== ---- shadow-4.5.orig/libmisc/chkname.c -+++ shadow-4.5/libmisc/chkname.c -@@ -47,27 +47,46 @@ - #include "chkname.h" - +diff -up shadow-4.6/libmisc/chkname.c.goodname shadow-4.6/libmisc/chkname.c +--- shadow-4.6/libmisc/chkname.c.goodname 2020-10-23 12:50:47.202529031 +0200 ++++ shadow-4.6/libmisc/chkname.c 2020-10-23 12:54:54.604692559 +0200 +@@ -49,25 +49,44 @@ static bool is_valid_name (const char *name) --{ -+{ + { /* - * User/group names must match [a-z_][a-z0-9_-]*[$] - */ @@ -60,11 +56,10 @@ Index: shadow-4.5/libmisc/chkname.c } bool is_valid_user_name (const char *name) -Index: shadow-4.5/man/groupadd.8.xml -=================================================================== ---- shadow-4.5.orig/man/groupadd.8.xml -+++ shadow-4.5/man/groupadd.8.xml -@@ -256,10 +256,14 @@ +diff -up shadow-4.6/man/groupadd.8.xml.goodname shadow-4.6/man/groupadd.8.xml +--- shadow-4.6/man/groupadd.8.xml.goodname 2018-04-29 18:42:37.000000000 +0200 ++++ shadow-4.6/man/groupadd.8.xml 2020-10-23 12:50:47.202529031 +0200 +@@ -273,10 +273,14 @@ CAVEATS @@ -72,22 +67,21 @@ Index: shadow-4.5/man/groupadd.8.xml - followed by lower case letters, digits, underscores, or dashes. - They can end with a dollar sign. - In regular expression terms: [a-z_][a-z0-9_-]*[$]? -+ Groupnames may contain only lower and upper case letters, digits, -+ underscores, or dashes. They can end with a dollar sign. ++ Groupnames may begin with lower and upper case letters, digits, ++ underscores, or periods. They may continue with all the aforementioned ++ characters, or dashes. Finally, they can end with a dollar sign. + -+ Dashes are not allowed at the beginning of the groupname. -+ Fully numeric groupnames and groupnames . or .. are -+ also disallowed. ++ Fully numeric groupnames and groupnames containing only . or .. are ++ disallowed. + + In regular expression terms: [a-zA-Z0-9_.][a-zA-Z0-9_.-]*[$]? Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long. -Index: shadow-4.5/man/useradd.8.xml -=================================================================== ---- shadow-4.5.orig/man/useradd.8.xml -+++ shadow-4.5/man/useradd.8.xml -@@ -633,10 +633,16 @@ +diff -up shadow-4.6/man/useradd.8.xml.goodname shadow-4.6/man/useradd.8.xml +--- shadow-4.6/man/useradd.8.xml.goodname 2018-04-29 18:42:37.000000000 +0200 ++++ shadow-4.6/man/useradd.8.xml 2020-10-23 12:50:47.202529031 +0200 +@@ -650,10 +650,16 @@ @@ -95,12 +89,12 @@ Index: shadow-4.5/man/useradd.8.xml - followed by lower case letters, digits, underscores, or dashes. - They can end with a dollar sign. - In regular expression terms: [a-z_][a-z0-9_-]*[$]? -+ Usernames may contain only lower and upper case letters, digits, -+ underscores, or dashes. They can end with a dollar sign. ++ Usernames may begin with lower and upper case letters, digits, ++ underscores, or periods. They may continue with all the aforementioned ++ characters, or dashes. Finally, they can end with a dollar sign. + -+ Dashes are not allowed at the beginning of the username. -+ Fully numeric usernames and usernames . or .. are -+ also disallowed. It is not recommended to use usernames beginning ++ Fully numeric usernames and usernames containing only . or .. are ++ disallowed. It is not recommended to use usernames beginning + with . character as their home directories will be hidden in + the ls output. + diff --git a/SOURCES/shadow-4.3.1-manfix.patch b/SOURCES/shadow-4.6-manfix.patch similarity index 77% rename from SOURCES/shadow-4.3.1-manfix.patch rename to SOURCES/shadow-4.6-manfix.patch index bd1577e..80ae198 100644 --- a/SOURCES/shadow-4.3.1-manfix.patch +++ b/SOURCES/shadow-4.6-manfix.patch @@ -1,7 +1,6 @@ -Index: shadow-4.5/man/groupmems.8.xml -=================================================================== ---- shadow-4.5.orig/man/groupmems.8.xml -+++ shadow-4.5/man/groupmems.8.xml +diff -up shadow-4.6/man/groupmems.8.xml.manfix shadow-4.6/man/groupmems.8.xml +--- shadow-4.6/man/groupmems.8.xml.manfix 2018-04-29 18:42:37.000000000 +0200 ++++ shadow-4.6/man/groupmems.8.xml 2020-10-23 13:15:24.105387634 +0200 @@ -179,20 +179,10 @@ SETUP @@ -26,10 +25,9 @@ Index: shadow-4.5/man/groupmems.8.xml -Index: shadow-4.5/man/chage.1.xml -=================================================================== ---- shadow-4.5.orig/man/chage.1.xml -+++ shadow-4.5/man/chage.1.xml +diff -up shadow-4.6/man/chage.1.xml.manfix shadow-4.6/man/chage.1.xml +--- shadow-4.6/man/chage.1.xml.manfix 2018-04-29 18:42:37.000000000 +0200 ++++ shadow-4.6/man/chage.1.xml 2020-10-23 13:15:24.105387634 +0200 @@ -102,6 +102,9 @@ Set the number of days since January 1st, 1970 when the password was last changed. The date may also be expressed in the format @@ -73,11 +71,10 @@ Index: shadow-4.5/man/chage.1.xml The chage command is restricted to the root user, except for the option, which may be used by an unprivileged user to determine when their password or account is due -Index: shadow-4.5/man/ja/man5/login.defs.5 -=================================================================== ---- shadow-4.5.orig/man/ja/man5/login.defs.5 -+++ shadow-4.5/man/ja/man5/login.defs.5 -@@ -147,10 +147,6 @@ PASS_MAX_DAYS, PASS_MIN_DAYS, PASS_WARN_ +diff -up shadow-4.6/man/ja/man5/login.defs.5.manfix shadow-4.6/man/ja/man5/login.defs.5 +--- shadow-4.6/man/ja/man5/login.defs.5.manfix 2018-04-29 18:42:37.000000000 +0200 ++++ shadow-4.6/man/ja/man5/login.defs.5 2020-10-23 13:15:24.106387639 +0200 +@@ -147,10 +147,6 @@ 以下の参照表は、 shadow パスワード機能のどのプログラムが どのパラメータを使用するかを示したものである。 .na @@ -88,11 +85,10 @@ Index: shadow-4.5/man/ja/man5/login.defs.5 .IP groupadd 12 GID_MAX GID_MIN .IP newusers 12 -Index: shadow-4.5/man/login.defs.5.xml -=================================================================== ---- shadow-4.5.orig/man/login.defs.5.xml -+++ shadow-4.5/man/login.defs.5.xml -@@ -162,6 +162,17 @@ +diff -up shadow-4.6/man/login.defs.5.xml.manfix shadow-4.6/man/login.defs.5.xml +--- shadow-4.6/man/login.defs.5.xml.manfix 2018-04-29 18:42:37.000000000 +0200 ++++ shadow-4.6/man/login.defs.5.xml 2020-10-23 13:15:43.280475188 +0200 +@@ -162,6 +162,27 @@ long numeric parameters is machine-dependent. @@ -106,11 +102,21 @@ Index: shadow-4.5/man/login.defs.5.xml + and UMASK for pam_umask module. Refer to + pam(8) for more information. + ++ ++ ++ Please also take into account that this man page is generic and some of ++ the options may be unsupported by currently installed tools. In case of ++ doubt check and ++ . For example see ++ login ++ 1 for login specific options such ++ as LOGIN_STRING. ++ + The following configuration items are provided: -@@ -252,16 +263,6 @@ +@@ -252,16 +273,6 @@ @@ -127,7 +133,7 @@ Index: shadow-4.5/man/login.defs.5.xml chgpasswd -@@ -282,14 +283,6 @@ +@@ -282,14 +293,6 @@ @@ -142,7 +148,7 @@ Index: shadow-4.5/man/login.defs.5.xml -@@ -350,34 +343,6 @@ +@@ -350,34 +353,6 @@ @@ -177,7 +183,7 @@ Index: shadow-4.5/man/login.defs.5.xml newgrp / sg -@@ -405,17 +370,6 @@ +@@ -405,17 +380,6 @@ @@ -195,7 +201,7 @@ Index: shadow-4.5/man/login.defs.5.xml pwck -@@ -442,32 +396,6 @@ +@@ -442,32 +406,6 @@ @@ -228,10 +234,9 @@ Index: shadow-4.5/man/login.defs.5.xml useradd -Index: shadow-4.5/man/shadow.5.xml -=================================================================== ---- shadow-4.5.orig/man/shadow.5.xml -+++ shadow-4.5/man/shadow.5.xml +diff -up shadow-4.6/man/shadow.5.xml.manfix shadow-4.6/man/shadow.5.xml +--- shadow-4.6/man/shadow.5.xml.manfix 2018-04-29 18:42:37.000000000 +0200 ++++ shadow-4.6/man/shadow.5.xml 2020-10-23 13:15:24.106387639 +0200 @@ -129,7 +129,7 @@ @@ -261,10 +266,9 @@ Index: shadow-4.5/man/shadow.5.xml Note that an account expiration differs from a password -Index: shadow-4.5/man/useradd.8.xml -=================================================================== ---- shadow-4.5.orig/man/useradd.8.xml -+++ shadow-4.5/man/useradd.8.xml +diff -up shadow-4.6/man/useradd.8.xml.manfix shadow-4.6/man/useradd.8.xml +--- shadow-4.6/man/useradd.8.xml.manfix 2020-10-23 13:15:24.100387611 +0200 ++++ shadow-4.6/man/useradd.8.xml 2020-10-23 13:15:24.106387639 +0200 @@ -347,6 +347,11 @@ is not enabled, no home directories are created. @@ -277,10 +281,9 @@ Index: shadow-4.5/man/useradd.8.xml -Index: shadow-4.5/man/usermod.8.xml -=================================================================== ---- shadow-4.5.orig/man/usermod.8.xml -+++ shadow-4.5/man/usermod.8.xml +diff -up shadow-4.6/man/usermod.8.xml.manfix shadow-4.6/man/usermod.8.xml +--- shadow-4.6/man/usermod.8.xml.manfix 2018-04-29 18:42:37.000000000 +0200 ++++ shadow-4.6/man/usermod.8.xml 2020-10-23 13:15:24.106387639 +0200 @@ -132,7 +132,8 @@ If the option is given, the contents of the current home directory will @@ -301,10 +304,9 @@ Index: shadow-4.5/man/usermod.8.xml This option is only valid in combination with the -diff --git a/man/login.defs.d/SUB_GID_COUNT.xml b/man/login.defs.d/SUB_GID_COUNT.xml -index 01ace007..93fe7421 100644 ---- a/man/login.defs.d/SUB_GID_COUNT.xml -+++ b/man/login.defs.d/SUB_GID_COUNT.xml +diff -up shadow-4.6/man/login.defs.d/SUB_GID_COUNT.xml.manfix shadow-4.6/man/login.defs.d/SUB_GID_COUNT.xml +--- shadow-4.6/man/login.defs.d/SUB_GID_COUNT.xml.manfix 2018-04-29 18:42:37.000000000 +0200 ++++ shadow-4.6/man/login.defs.d/SUB_GID_COUNT.xml 2020-10-23 13:15:24.106387639 +0200 @@ -42,7 +42,7 @@ The default values for , @@ -314,10 +316,9 @@ index 01ace007..93fe7421 100644 -diff --git a/man/login.defs.d/SUB_UID_COUNT.xml b/man/login.defs.d/SUB_UID_COUNT.xml -index 5ad812f7..516417b7 100644 ---- a/man/login.defs.d/SUB_UID_COUNT.xml -+++ b/man/login.defs.d/SUB_UID_COUNT.xml +diff -up shadow-4.6/man/login.defs.d/SUB_UID_COUNT.xml.manfix shadow-4.6/man/login.defs.d/SUB_UID_COUNT.xml +--- shadow-4.6/man/login.defs.d/SUB_UID_COUNT.xml.manfix 2018-04-29 18:42:37.000000000 +0200 ++++ shadow-4.6/man/login.defs.d/SUB_UID_COUNT.xml 2020-10-23 13:15:24.106387639 +0200 @@ -42,7 +42,7 @@ The default values for , @@ -328,9 +329,9 @@ index 5ad812f7..516417b7 100644 diff -up shadow-4.6/man/groupadd.8.xml.manfix shadow-4.6/man/groupadd.8.xml ---- shadow-4.6/man/groupadd.8.xml.manfix 2019-04-02 16:35:52.096637444 +0200 -+++ shadow-4.6/man/groupadd.8.xml 2019-06-07 14:23:57.477602106 +0200 -@@ -320,13 +320,13 @@ +--- shadow-4.6/man/groupadd.8.xml.manfix 2020-10-23 13:15:24.100387611 +0200 ++++ shadow-4.6/man/groupadd.8.xml 2020-10-23 13:15:24.106387639 +0200 +@@ -322,13 +322,13 @@ 4 @@ -346,4 +347,3 @@ diff -up shadow-4.6/man/groupadd.8.xml.manfix shadow-4.6/man/groupadd.8.xml - diff --git a/SOURCES/shadow-4.6-sssd-redirect-warning.patch b/SOURCES/shadow-4.6-sssd-redirect-warning.patch new file mode 100644 index 0000000..c452231 --- /dev/null +++ b/SOURCES/shadow-4.6-sssd-redirect-warning.patch @@ -0,0 +1,59 @@ +From 87257a49a1821d67870aa9760c71b6791583709c Mon Sep 17 00:00:00 2001 +From: ikerexxe +Date: Fri, 2 Oct 2020 16:09:42 +0200 +Subject: [PATCH] lib/sssd: redirect warning message to file + +Instead of printing warning in stderr print it to file. This way the +user is not spammed with unnecessary messages when updating packages. + +Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1749001 +--- + lib/sssd.c | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) + +diff --git a/lib/sssd.c b/lib/sssd.c +index 80e49e55..f864ce68 100644 +--- a/lib/sssd.c ++++ b/lib/sssd.c +@@ -11,7 +11,7 @@ + #include "prototypes.h" + #include "sssd.h" + +-#define MSG_SSSD_FLUSH_CACHE_FAILED "%s: Failed to flush the sssd cache.\n" ++#define MSG_SSSD_FLUSH_CACHE_FAILED "%s: Failed to flush the sssd cache." + + int sssd_flush_cache (int dbflags) + { +@@ -46,24 +46,22 @@ int sssd_flush_cache (int dbflags) + free(sss_cache_args); + if (rv != 0) { + /* run_command writes its own more detailed message. */ +- (void) fprintf (stderr, _(MSG_SSSD_FLUSH_CACHE_FAILED), Prog); ++ SYSLOG ((LOG_WARN, MSG_SSSD_FLUSH_CACHE_FAILED, Prog)); + return -1; + } + + code = WEXITSTATUS (status); + if (!WIFEXITED (status)) { +- (void) fprintf (stderr, +- _("%s: sss_cache did not terminate normally (signal %d)\n"), +- Prog, WTERMSIG (status)); ++ SYSLOG ((LOG_WARN, "%s: sss_cache did not terminate normally (signal %d)", ++ Prog, WTERMSIG (status))); + return -1; + } else if (code == E_CMD_NOTFOUND) { + /* sss_cache is not installed, or it is installed but uses an + interpreter that is missing. Probably the former. */ + return 0; + } else if (code != 0) { +- (void) fprintf (stderr, _("%s: sss_cache exited with status %d\n"), +- Prog, code); +- (void) fprintf (stderr, _(MSG_SSSD_FLUSH_CACHE_FAILED), Prog); ++ SYSLOG ((LOG_WARN, "%s: sss_cache exited with status %d", Prog, code)); ++ SYSLOG ((LOG_WARN, MSG_SSSD_FLUSH_CACHE_FAILED, Prog)); + return -1; + } + +-- +2.26.2 + diff --git a/SPECS/shadow-utils.spec b/SPECS/shadow-utils.spec index 81dfeef..a806a39 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.6 -Release: 11%{?dist} +Release: 12%{?dist} Epoch: 2 URL: http://pkg-shadow.alioth.debian.org/ Source0: https://github.com/shadow-maint/shadow/releases/download/%{version}/shadow-%{version}.tar.xz @@ -11,13 +11,13 @@ Source3: shadow-utils.login.defs Source4: shadow-bsd.txt Source5: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt Patch0: shadow-4.6-redhat.patch -Patch1: shadow-4.5-goodname.patch +Patch1: shadow-4.6-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 +Patch15: shadow-4.6-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 @@ -43,6 +43,8 @@ Patch42: shadow-4.6-regular-user.patch Patch43: shadow-4.6-home_mode-directive.patch # Upstreamed Patch44: shadow-4.6-check-local-groups.patch +# https://github.com/shadow-maint/shadow/commit/e84df9e163e133eb11a2728024ff3e3440592cf8 +Patch45: shadow-4.6-sssd-redirect-warning.patch License: BSD and GPLv2+ Group: System Environment/Base @@ -105,6 +107,7 @@ are used for managing group accounts. %patch42 -p1 -b .regular-user %patch43 -p1 -b .home_mode-directive %patch44 -p1 -b .check-local-groups +%patch45 -p1 -b .sssd-redirect-warning iconv -f ISO88591 -t utf-8 doc/HOWTO > doc/HOWTO.utf8 cp -f doc/HOWTO.utf8 doc/HOWTO @@ -259,6 +262,11 @@ done %{_mandir}/man8/vigr.8* %changelog +* Fri Oct 23 2020 Iker Pedrosa - 2:4.6-12 +- lib/sssd: redirect warning message to file (#1749001) +- useradd: clarify valid usernames/groupnames (#1869432) +- login.defs: link login specific information to its own package (#1804766) + * Fri Aug 7 2020 Iker Pedrosa - 2:4.6-11 - change UMASK value and add HOME_MODE in login.defs (#1777718)