From c2ed51b41028cc82ee40b051cf417f998e1dfacff7df82e38e8084fc0e9ae2ac Mon Sep 17 00:00:00 2001
From: Thorsten Kukuk <kukuk@suse.com>
Date: Tue, 13 Nov 2012 16:35:05 +0000
Subject: [PATCH] - Fix getdef default variables (getdef-new-defs.diff)

OBS-URL: https://build.opensuse.org/package/show/Base:System/shadow?expand=0&rev=5
---
 getdef-new-defs.diff   | 32 ++++++++++++++++++++++++++++++++
 shadow-login_defs.diff | 23 ++++++++++++++++-------
 shadow.changes         |  5 +++++
 shadow.spec            |  2 ++
 4 files changed, 55 insertions(+), 7 deletions(-)
 create mode 100644 getdef-new-defs.diff

diff --git a/getdef-new-defs.diff b/getdef-new-defs.diff
new file mode 100644
index 0000000..cd0a694
--- /dev/null
+++ b/getdef-new-defs.diff
@@ -0,0 +1,32 @@
+--- lib/getdef.c
++++ lib/getdef.c	2012/11/13 16:26:34
+@@ -64,6 +64,7 @@
+ 	{"FAKE_SHELL", NULL},
+ 	{"GID_MAX", NULL},
+ 	{"GID_MIN", NULL},
++	{"GROUPADD_CMD", NULL},
+ 	{"HUSHLOGIN_FILE", NULL},
+ 	{"KILLCHAR", NULL},
+ 	{"LOGIN_RETRIES", NULL},
+@@ -93,7 +94,10 @@
+ 	{"UID_MAX", NULL},
+ 	{"UID_MIN", NULL},
+ 	{"UMASK", NULL},
++	{"USERADD_CMD", NULL},
+ 	{"USERDEL_CMD", NULL},
++	{"USERDEL_PRECMD", NULL},
++	{"USERDEL_POSTCMD", NULL},
+ 	{"USERGROUPS_ENAB", NULL},
+ #ifndef USE_PAM
+ 	{"CHFN_AUTH", NULL},
+@@ -129,6 +133,10 @@
+ 	{"TCB_SYMLINKS", NULL},
+ 	{"USE_TCB", NULL},
+ #endif
++	/* Used by /bin/login */
++	{"MOTD_FILE", NULL},
++	{"ENV_PATH", NULL},
++	{"ENV_ROOTPATH", NULL},
+ 	{NULL, NULL}
+ };
+ 
diff --git a/shadow-login_defs.diff b/shadow-login_defs.diff
index e49ecac..6386af4 100644
--- a/shadow-login_defs.diff
+++ b/shadow-login_defs.diff
@@ -1,5 +1,5 @@
 --- etc/login.defs
-+++ etc/login.defs	2012/09/26 12:02:14
++++ etc/login.defs	2012/11/13 16:30:57
 @@ -1,8 +1,6 @@
  #
  # /etc/login.defs - Configuration control definitions for the shadow package.
@@ -166,7 +166,16 @@
  
  # Default initial "umask" value used by login on non-PAM enabled systems.
  # Default "umask" value for pam_umask on PAM enabled systems.
-@@ -206,40 +123,37 @@
+@@ -197,49 +114,44 @@
+ #
+ #	PASS_MAX_DAYS	Maximum number of days a password may be used.
+ #	PASS_MIN_DAYS	Minimum number of days allowed between password changes.
+-#	PASS_MIN_LEN	Minimum acceptable password length.
+ #	PASS_WARN_AGE	Number of days warning given before a password expires.
+ #
+ PASS_MAX_DAYS	99999
+ PASS_MIN_DAYS	0
+-PASS_MIN_LEN	5
  PASS_WARN_AGE	7
  
  #
@@ -222,7 +231,7 @@
  
  #
  # Max time in seconds for login
-@@ -247,28 +161,6 @@
+@@ -247,28 +159,6 @@
  LOGIN_TIMEOUT		60
  
  #
@@ -251,7 +260,7 @@
  # Which fields may be changed by regular users using chfn - use
  # any combination of letters "frwh" (full name, room number, work
  # phone, home phone).  If not defined, no changes are allowed.
-@@ -277,13 +169,6 @@
+@@ -277,13 +167,6 @@
  CHFN_RESTRICT		rwh
  
  #
@@ -265,7 +274,7 @@
  # Only works if compiled with MD5_CRYPT defined:
  # If set to "yes", new passwords will be encrypted using the MD5-based
  # algorithm compatible with the one used by recent releases of FreeBSD.
-@@ -345,16 +230,12 @@
+@@ -345,16 +228,12 @@
  DEFAULT_HOME	yes
  
  #
@@ -284,7 +293,7 @@
  #USERDEL_CMD	/usr/sbin/userdel_local
  
  #
-@@ -364,7 +245,7 @@
+@@ -364,7 +243,7 @@
  #
  # This also enables userdel to remove user groups if no members exist.
  #
@@ -293,7 +302,7 @@
  
  #
  # If set to a non-nul number, the shadow utilities will make sure that
-@@ -383,5 +264,41 @@
+@@ -383,5 +262,41 @@
  # This option is overridden with the -M or -m flags on the useradd command
  # line.
  #
diff --git a/shadow.changes b/shadow.changes
index 883b5fe..6bb097f 100644
--- a/shadow.changes
+++ b/shadow.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Nov 13 17:31:50 CET 2012 - kukuk@suse.de
+
+- Fix getdef default variables (getdef-new-defs.diff)
+
 -------------------------------------------------------------------
 Tue Nov 13 10:36:28 CET 2012 - kukuk@suse.de
 
diff --git a/shadow.spec b/shadow.spec
index 76683f4..d61e1fa 100644
--- a/shadow.spec
+++ b/shadow.spec
@@ -34,6 +34,7 @@ Patch1:         userdel-scripts.diff
 Patch2:         useradd-script.diff
 Patch3:         chkname-regex.diff
 Patch4:         useradd-default.diff
+Patch5:         getdef-new-defs.diff
 BuildRequires:  audit-devel
 BuildRequires:  libacl-devel
 BuildRequires:  libattr-devel
@@ -57,6 +58,7 @@ group accounts.
 %patch2 -p0
 %patch3 -p0
 %patch4 -p0
+%patch5 -p0
 
 iconv -f ISO88591 -t utf-8  doc/HOWTO > doc/HOWTO.utf8
 mv -v doc/HOWTO.utf8 doc/HOWTO