Accepting request 603563 from Linux-PAM

OBS-URL: https://build.opensuse.org/request/show/603563
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pam?expand=0&rev=90

pam-fix-config-order-in-manpage.patch

@@ -0,0 +1,71 @@
+Index: Linux-PAM-1.3.0/modules/pam_umask/pam_umask.8.xml
+===================================================================
+--- Linux-PAM-1.3.0.orig/modules/pam_umask/pam_umask.8.xml
++++ Linux-PAM-1.3.0/modules/pam_umask/pam_umask.8.xml
+@@ -48,22 +48,22 @@
+       <itemizedlist>
+         <listitem>
+           <para>
+-            umask= argument
++            umask= entry in the user's GECOS field
+           </para>
+         </listitem>
+         <listitem>
+           <para>
+-            umask= entry in the user's GECOS field
++            umask= argument
+           </para>
+         </listitem>
+         <listitem>
+           <para>
+-            UMASK= entry from /etc/default/login
++            UMASK= entry from /etc/login.defs
+           </para>
+         </listitem>
+         <listitem>
+           <para>
+-            UMASK entry from /etc/login.defs
++            UMASK= entry from /etc/default/login
+           </para>
+         </listitem>
+       </itemizedlist>
+Index: Linux-PAM-1.3.0/modules/pam_umask/pam_umask.8
+===================================================================
+--- Linux-PAM-1.3.0.orig/modules/pam_umask/pam_umask.8
++++ Linux-PAM-1.3.0/modules/pam_umask/pam_umask.8
+@@ -46,7 +46,7 @@ The PAM module tries to get the umask va
+ .sp -1
+ .IP \(bu 2.3
+ .\}
+-umask= argument
++umask= entry in the user\*(Aqs GECOS field
+ .RE
+ .sp
+ .RS 4
+@@ -57,7 +57,7 @@ umask= argument
+ .sp -1
+ .IP \(bu 2.3
+ .\}
+-umask= entry in the user\*(Aqs GECOS field
++umask= argument
+ .RE
+ .sp
+ .RS 4
+@@ -68,7 +68,7 @@ umask= entry in the user\*(Aqs GECOS fie
+ .sp -1
+ .IP \(bu 2.3
+ .\}
+-UMASK= entry from /etc/default/login
++UMASK= entry from /etc/login\&.defs
+ .RE
+ .sp
+ .RS 4
+@@ -79,7 +79,7 @@ UMASK= entry from /etc/default/login
+ .sp -1
+ .IP \(bu 2.3
+ .\}
+-UMASK entry from /etc/login\&.defs
++UMASK= entry from /etc/default/login
+ .RE
+ .PP
+ The GECOS field is split on comma \*(Aq,\*(Aq characters\&. The module also in addition to the umask= entry recognizes pri= entry, which sets the nice priority value for the session, and ulimit= entry, which sets the maximum size of files the processes in the session can create\&.

pam.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu May  3 07:08:50 UTC 2018 - josef.moellers@suse.com
+
+- pam_umask.8 needed to be patched as well.
+  [bsc#1089884, pam-fix-config-order-in-manpage.patch]
+
+-------------------------------------------------------------------
+Wed May  2 12:32:40 UTC 2018 - josef.moellers@suse.com
+
+- Changed order of configuration files to reflect actual code.
+  [bsc#1089884, pam-fix-config-order-in-manpage.patch]
+
 -------------------------------------------------------------------
 Thu Feb 22 15:10:42 UTC 2018 - fvogt@suse.com
 

pam.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package pam
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -64,6 +64,7 @@ Patch0:         fix-man-links.dif
 Patch2:         pam-limit-nproc.patch
 Patch3:         encryption_method_nis.diff
 Patch4:         pam-hostnames-in-access_conf.patch
+Patch5:         pam-fix-config-order-in-manpage.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # Remove with next version update:
 BuildRequires:  autoconf
@@ -115,6 +116,7 @@ building both PAM-aware applications and modules for use with PAM.
 %patch2 -p1
 %patch3 -p0
 %patch4 -p0
+%patch5 -p1
 
 %build
 autoreconf -fiv