- updated to 4.15.1, partial PLD merge

[packages/shadow.git] / shadow-tld.patch

diff --git a/shadow-tld.patch b/shadow-tld.patch
index 4fe51129ab8a571cc4baba7091aa49f17c13cb5b..f75218ade6a4bf6b7835bf410a9debfc934a3149 100644 (file)
--- a/shadow-tld.patch
+++ b/shadow-tld.patch
@@ -1,49 +1,50 @@
-diff -urpa shadow-4.8.orig/libmisc/find_new_gid.c shadow-4.8/libmisc/find_new_gid.c
---- shadow-4.8.orig/libmisc/find_new_gid.c     2019-10-13 04:52:08.000000000 +0200
-+++ shadow-4.8/libmisc/find_new_gid.c  2019-12-15 23:40:29.745000000 +0100
-@@ -61,8 +61,8 @@ static int get_ranges (bool sys_group, g
+diff -urpa shadow-4.15.1.orig/lib/find_new_gid.c shadow-4.15.1/lib/find_new_gid.c
+--- shadow-4.15.1.orig/lib/find_new_gid.c      2024-03-01 02:50:52.000000000 +0100
++++ shadow-4.15.1/lib/find_new_gid.c   2024-04-02 12:50:48.196919001 +0200
+@@ -40,8 +40,8 @@ static int get_ranges (bool sys_group, g
                /* A requested ID is allowed to be below the autoselect range */
                *preferred_min = (gid_t) 1;
  
 -              /* Get the minimum ID range from login.defs or default to 101 */
--              *min_id = (gid_t) getdef_ulong ("SYS_GID_MIN", 101UL);
+-              *min_id = getdef_ulong ("SYS_GID_MIN", 101UL);
 +              /* Get the minimum ID range from login.defs or default to 10 */
-+              *min_id = (gid_t) getdef_ulong ("SYS_GID_MIN", 10UL);
++              *min_id = getdef_ulong ("SYS_GID_MIN", 10UL);
  
                /*
                 * If SYS_GID_MAX is unspecified, we should assume it to be one
-diff -urpa shadow-4.8.orig/libmisc/find_new_uid.c shadow-4.8/libmisc/find_new_uid.c
---- shadow-4.8.orig/libmisc/find_new_uid.c     2019-10-13 04:52:08.000000000 +0200
-+++ shadow-4.8/libmisc/find_new_uid.c  2019-12-15 23:40:29.746000000 +0100
-@@ -61,8 +61,8 @@ static int get_ranges (bool sys_user, ui
+diff -urpa shadow-4.15.1.orig/lib/find_new_uid.c shadow-4.15.1/lib/find_new_uid.c
+--- shadow-4.15.1.orig/lib/find_new_uid.c      2024-03-01 02:50:52.000000000 +0100
++++ shadow-4.15.1/lib/find_new_uid.c   2024-04-02 12:51:12.513247551 +0200
+@@ -40,8 +40,8 @@ static int get_ranges (bool sys_user, ui
                /* A requested ID is allowed to be below the autoselect range */
                *preferred_min = (uid_t) 1;
  
 -              /* Get the minimum ID range from login.defs or default to 101 */
--              *min_id = (uid_t) getdef_ulong ("SYS_UID_MIN", 101UL);
+-              *min_id = getdef_ulong ("SYS_UID_MIN", 101UL);
 +              /* Get the minimum ID range from login.defs or default to 1 */
-+              *min_id = (uid_t) getdef_ulong ("SYS_UID_MIN", 1UL);
++              *min_id = getdef_ulong ("SYS_UID_MIN", 1UL);
  
                /*
                 * If SYS_UID_MAX is unspecified, we should assume it to be one
-diff -urpa shadow-4.8.orig/src/useradd.c shadow-4.8/src/useradd.c
---- shadow-4.8.orig/src/useradd.c      2019-12-01 17:52:32.000000000 +0100
-+++ shadow-4.8/src/useradd.c   2019-12-15 23:40:29.745000000 +0100
-@@ -96,10 +96,10 @@ const char *Prog;
- /*
-  * These defaults are used if there is no defaults file.
-  */
--static gid_t def_group = 100;
-+static gid_t def_group = 1000;
+diff -urpa shadow-4.15.1.orig/src/useradd.c shadow-4.15.1/src/useradd.c
+--- shadow-4.15.1.orig/src/useradd.c   2024-03-23 21:32:25.000000000 +0100
++++ shadow-4.15.1/src/useradd.c        2024-04-02 12:43:41.243157136 +0200
+@@ -93,11 +93,11 @@ static const char Prog[] = "useradd";
+ static gid_t def_group = 1000;
+ static const char *def_groups = "";
  static const char *def_gname = "other";
 -static const char *def_home = "/home";
--static const char *def_shell = "";
+-static const char *def_shell = "/bin/bash";
 +static const char *def_home = "/home/users";
 +static const char *def_shell = "/sbin/nologin";
  static const char *def_template = SKEL_DIR;
- static const char *def_create_mail_spool = "no";
+ static const char *def_usrtemplate = USRSKELDIR;
+-static const char *def_create_mail_spool = "yes";
++static const char *def_create_mail_spool = "no";
+ static const char *def_log_init = "yes";
  
-@@ -109,7 +109,7 @@ static const char *def_expire = "";
+ static long def_inactive = -1;
+@@ -106,7 +106,7 @@ static const char *def_expire = "";
  #define       VALID(s)        (strcspn (s, ":\n") == strlen (s))
  
  static const char *user_name = "";