From 74bd51166bf09bb1a8c56ac0bfed2ea1823c59d76fcdfaf871730f73bb946f5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20M=C3=B6llers?= Date: Wed, 2 May 2018 14:44:06 +0000 Subject: [PATCH 1/2] Accepting request 603146 from home:jmoellers:branches:Linux-PAM OBS-URL: https://build.opensuse.org/request/show/603146 OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam?expand=0&rev=175 --- pam-fix-config-order-in-manpage.patch | 31 +++++++++++++++++++++++++++ pam.changes | 6 ++++++ pam.spec | 4 +++- 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 pam-fix-config-order-in-manpage.patch diff --git a/pam-fix-config-order-in-manpage.patch b/pam-fix-config-order-in-manpage.patch new file mode 100644 index 0000000..0698b82 --- /dev/null +++ b/pam-fix-config-order-in-manpage.patch @@ -0,0 +1,31 @@ +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 @@ + + + +- umask= argument ++ umask= entry in the user's GECOS field + + + + +- umask= entry in the user's GECOS field ++ umask= argument + + + + +- UMASK= entry from /etc/default/login ++ UMASK= entry from /etc/login.defs + + + + +- UMASK entry from /etc/login.defs ++ UMASK= entry from /etc/default/login + + + diff --git a/pam.changes b/pam.changes index de03490..3052e55 100644 --- a/pam.changes +++ b/pam.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/pam.spec b/pam.spec index c3e44c9..7c4aa16 100644 --- a/pam.spec +++ b/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 From 126fde1f546ba98b8d779a738c7609332d9f8e086dbb285f78c179ff13ddb4df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20M=C3=B6llers?= Date: Thu, 3 May 2018 07:51:52 +0000 Subject: [PATCH 2/2] Accepting request 603562 from home:jmoellers:branches:Linux-PAM OBS-URL: https://build.opensuse.org/request/show/603562 OBS-URL: https://build.opensuse.org/package/show/Linux-PAM/pam?expand=0&rev=176 --- pam-fix-config-order-in-manpage.patch | 40 +++++++++++++++++++++++++++ pam.changes | 6 ++++ 2 files changed, 46 insertions(+) diff --git a/pam-fix-config-order-in-manpage.patch b/pam-fix-config-order-in-manpage.patch index 0698b82..acd4eca 100644 --- a/pam-fix-config-order-in-manpage.patch +++ b/pam-fix-config-order-in-manpage.patch @@ -29,3 +29,43 @@ Index: Linux-PAM-1.3.0/modules/pam_umask/pam_umask.8.xml +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\&. diff --git a/pam.changes b/pam.changes index 3052e55..7c42d96 100644 --- a/pam.changes +++ b/pam.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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