Accepting request 727986 from Base:System

OBS-URL: https://build.opensuse.org/request/show/727986
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/shadow?expand=0&rev=34

encryption_method_nis.patch

@@ -1,32 +0,0 @@
-Add support for ENCRYPT_METHOD_NIS used by pam: modules/pam_unix/pam_unix_passwd.c.
-
-Index: lib/getdef.c
-===================================================================
---- lib/getdef.c.orig
-+++ lib/getdef.c
-@@ -85,6 +85,7 @@ static struct itemdef def_table[] = {
- 	{"CREATE_HOME", NULL},
- 	{"DEFAULT_HOME", NULL},
- 	{"ENCRYPT_METHOD", NULL},
-+	{"ENCRYPT_METHOD_NIS", NULL},
- 	{"ENV_PATH", NULL},
- 	{"ENV_ROOTPATH", NULL},
- 	{"ENV_SUPATH", NULL},
-Index: etc/login.defs
-===================================================================
---- etc/login.defs.orig
-+++ etc/login.defs
-@@ -187,10 +187,13 @@ CHFN_RESTRICT		rwh
- # If set to DES, DES-based algorithm will be used for encrypting password (default)
- # Overrides the MD5_CRYPT_ENAB option
- #
-+# ENCRYPT_METHOD_NIS is used by pam_unix_passwd.so.
-+#
- # Note: If you use PAM, it is recommended to use a value consistent with
- # the PAM modules configuration.
- #
- #ENCRYPT_METHOD DES
-+#ENCRYPT_METHOD_NIS DES
- 
- #
- # Only works if ENCRYPT_METHOD is set to SHA256 or SHA512.

shadow-login_defs-suse.patch

@@ -118,18 +118,16 @@ Index: etc/login.defs
  
  #
  # If set to MD5, MD5-based algorithm will be used for encrypting password
-@@ -210,8 +203,8 @@ CHFN_RESTRICT		rwh
+@@ -210,7 +203,7 @@ CHFN_RESTRICT		rwh
  # Note: If you use PAM, it is recommended to use a value consistent with
  # the PAM modules configuration.
  #
 -#ENCRYPT_METHOD DES
--#ENCRYPT_METHOD_NIS DES
 +ENCRYPT_METHOD SHA512
-+ENCRYPT_METHOD_NIS DES
  
  #
  # Only works if ENCRYPT_METHOD is set to SHA256 or SHA512.
-@@ -272,7 +265,7 @@ USERDEL_POSTCMD         /usr/sbin/userde
+@@ -268,7 +261,7 @@ USERDEL_POSTCMD         /usr/sbin/userde
  #
  # This also enables userdel(8) to remove user groups if no members exist.
  #

shadow.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Sep  2 11:12:59 UTC 2019 - mvetter@suse.com
+
+- bsc#1144060: Add pam_keyinit.so to /etc/pam.d configuration files
+  to support kernel keyring feature
+- Update pamd.tar.bz2 with pam configuration files accordingly
+
+-------------------------------------------------------------------
+Mon Aug 19 14:50:02 CEST 2019 - kukuk@suse.de
+
+- encryption_method_nis.patch: drop, DES should really not be used
+  anymore anywhere, even with NIS
+- shadow-login_defs-suse.patch: remove encryption NIS entry
+
 -------------------------------------------------------------------
 Fri Jul 26 23:44:56 CEST 2019 - sbrabec@suse.com
 

shadow.spec

@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 
@@ -51,8 +51,6 @@ Patch5:         shadow-util-linux.patch
 Patch6:         shadow-4.1.5.1-userdel-helpfix.patch
 # PATCH-FIX-FEDORA shadow-4.1.5.1-logmsg.patch kukuk@suse.com -- Fix error message.
 Patch7:         shadow-4.1.5.1-logmsg.patch
-# PATCH-FEATURE-SUSE encryption_method_nis.patch kukuk@suse.com -- Add support for ENCRYPT_METHOD_NIS used by SUSE patch in pam (pam_unix).
-Patch10:        encryption_method_nis.patch
 # PATCH-FEATURE-SUSE shadow-login_defs-comments.patch kukuk@suse.com -- Adjust login.defs comments.
 Patch13:        shadow-login_defs-comments.patch
 # PATCH-FEATURE-SUSE shadow-login_defs-suse.patch kukuk@suse.com -- Customize login.defs.
@@ -101,7 +99,6 @@ group accounts.
 %patch5
 %patch6
 %patch7
-%patch10
 %patch13
 %patch14
 %if 0%{?suse_version} < 1330