Up to 4.13; one of changes is: Fix regression in print_date (Xiami)

diff --git a/shadow-goodname.patch b/shadow-goodname.patch
deleted file mode 100644 (file)
index 151adef..0000000
--- a/shadow-goodname.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -up shadow-4.8/libmisc/chkname.c.goodname shadow-4.8/libmisc/chkname.c
---- shadow-4.8/libmisc/chkname.c.goodname      2020-01-13 09:44:41.968507996 +0100
-+++ shadow-4.8/libmisc/chkname.c       2020-01-13 09:46:27.863727732 +0100
-@@ -55,26 +55,44 @@ static bool is_valid_name (const char *n
-       }
- 
-       /*
--       * User/group names must match [a-z_][a-z0-9_-]*[$]
--       */
-+         * User/group names must match gnu e-regex:
-+         *    [a-zA-Z0-9_.][a-zA-Z0-9_.-]{0,30}[a-zA-Z0-9_.$-]?
-+         *
-+         * as a non-POSIX, extension, allow "$" as the last char for
-+         * sake of Samba 3.x "add machine script"
-+         *
-+         * Also do not allow fully numeric names or just "." or "..".
-+         */
-+      int numeric;
- 
--      if (('\0' == *name) ||
--          !((('a' <= *name) && ('z' >= *name)) || ('_' == *name))) {
-+      if ('\0' == *name ||
-+          ('.' == *name && (('.' == name[1] && '\0' == name[2]) ||
-+                            '\0' == name[1])) ||
-+          !((*name >= 'a' && *name <= 'z') ||
-+            (*name >= 'A' && *name <= 'Z') ||
-+            (*name >= '0' && *name <= '9') ||
-+            *name == '_' ||
-+            *name == '.')) {
-               return false;
-       }
- 
-+      numeric = isdigit(*name);
-+
-       while ('\0' != *++name) {
--              if (!(( ('a' <= *name) && ('z' >= *name) ) ||
--                    ( ('0' <= *name) && ('9' >= *name) ) ||
--                    ('_' == *name) ||
--                    ('-' == *name) ||
--                    ( ('$' == *name) && ('\0' == *(name + 1)) )
-+              if (!((*name >= 'a' && *name <= 'z') ||
-+                    (*name >= 'A' && *name <= 'Z') ||
-+                    (*name >= '0' && *name <= '9') ||
-+                    *name == '_' ||
-+                    *name == '.' ||
-+                    *name == '-' ||
-+                    (*name == '$' && name[1] == '\0')
-                    )) {
-                       return false;
-               }
-+              numeric &= isdigit(*name);
-       }
- 
--      return true;
-+      return !numeric;
- }
- 
- bool is_valid_user_name (const char *name)
---- shadow-4.12.3/man/groupadd.8.xml~  2022-08-09 01:30:40.000000000 +0300
-+++ shadow-4.12.3/man/groupadd.8.xml   2022-08-22 18:30:02.472610977 +0300
-@@ -64,10 +64,12 @@
-       files as needed.
-     </para>
-      <para>
--       Groupnames must start with a lower case letter or an underscore,
--       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.
-+
-+       Dashes are not allowed at the beginning of the groupname.
-+       Fully numeric groupnames and groupnames . or .. are
-+       also disallowed.
-      </para>
-      <para>
-        Groupnames may only be up to &GROUP_NAME_MAX_LENGTH; characters long.
-diff -up shadow-4.8/man/useradd.8.xml.goodname shadow-4.8/man/useradd.8.xml
---- shadow-4.8/man/useradd.8.xml.goodname      2019-10-05 03:23:58.000000000 +0200
-+++ shadow-4.8/man/useradd.8.xml       2020-01-13 09:44:41.968507996 +0100
-@@ -661,10 +661,14 @@
-     </para>
- 
-     <para>
--      Usernames must start with a lower case letter or an underscore,
--      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.
-+
-+      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
-+      with . character as their home directories will be hidden in
-+      the <command>ls</command> output.
-     </para>
-     <para>
-       Usernames may only be up to 32 characters long.

diff --git a/shadow.spec b/shadow.spec
index ea960efe24cdbf01d75963443cbdffc24ec3b7aa..bff67578c2f042a539f82b8619ad2c36fa574373 100644 (file)
--- a/shadow.spec
+++ b/shadow.spec
@@ -13,13 +13,13 @@ Summary(pl.UTF-8):  Narzędzia do obsługi mechanizmu ukrytych haseł
 Summary(pt_BR.UTF-8):  Utilitários para o arquivo de senhas Shadow
 Summary(tr.UTF-8):     Gölge parola dosyası araçları
 Name:          shadow
-Version:       4.12.3
-Release:        3
+Version:       4.13
+Release:        1
 Epoch:         1
 License:       BSD
 Group:         Applications/System
 Source0:       https://github.com/shadow-maint/shadow/releases/download/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 710bcc89c39683609aacfef9f08bd854
+# Source0-md5: b1ab01b5462ddcf43588374d57bec123
 Source2:       %{name}-login.defs
 Source3:       %{name}.useradd
 Source10:      chage.pamd
@@ -37,8 +37,6 @@ Source21:     useradd.pamd
 Source22:      userdel.pamd
 Source23:      usermod.pamd
 Patch0:                %{name}-pld.patch
-# allow names with upper case letters or containing dot in the middle
-Patch1:                %{name}-goodname.patch
 URL:           https://github.com/shadow-maint/shadow
 BuildRequires: acl-devel
 BuildRequires: attr-devel
@@ -139,8 +137,6 @@ tworzyć mapowania uidów i gidów w przestrzeniach użytkowników.
 %prep
 %setup -q
 %patch0 -p1
-# allows dots in user/group names
-%patch1 -p1
 
 %build
 # NOTE: