mirror of
https://abf.rosa.ru/djam/pam.git
synced 2025-02-23 16:32:51 +00:00
Fixed patches
This commit is contained in:
parent
a911091d42
commit
5ea53b39ac
4 changed files with 15 additions and 47 deletions
12
fix.build.gcc11.patch
Normal file
12
fix.build.gcc11.patch
Normal file
|
@ -0,0 +1,12 @@
|
|||
diff -urN Linux-PAM-1.6.1/doc/Makefile.am Linux-PAM-1.6.1-patched/doc/Makefile.am
|
||||
--- Linux-PAM-1.6.1/doc/Makefile.am 2024-04-09 19:22:59.000000000 +0300
|
||||
+++ Linux-PAM-1.6.1-patched/doc/Makefile.am 2024-04-11 13:49:36.772917248 +0300
|
||||
@@ -2,7 +2,7 @@
|
||||
# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de>
|
||||
#
|
||||
|
||||
-SUBDIRS = man specs sag adg mwg
|
||||
+SUBDIRS = man sag adg mwg
|
||||
|
||||
CLEANFILES = *~
|
||||
DISTCLEANFILES = custom-html.xsl custom-man.xsl
|
|
@ -1,6 +1,6 @@
|
|||
diff -ruN a/doc/Makefile.am b/doc/Makefile.am
|
||||
--- a/doc/Makefile.am 2024-01-17 19:29:36.000000000 +0900
|
||||
+++ b/doc/Makefile.am 2024-03-15 14:07:00.797329756 +0900
|
||||
diff -urN Linux-PAM-1.6.1/doc/Makefile.am Linux-PAM-1.6.1-patched/doc/Makefile.am
|
||||
--- Linux-PAM-1.6.1/doc/Makefile.am 2024-04-09 19:22:59.000000000 +0300
|
||||
+++ Linux-PAM-1.6.1-patched/doc/Makefile.am 2024-04-11 13:49:36.772917248 +0300
|
||||
@@ -2,7 +2,7 @@
|
||||
# Copyright (c) 2005, 2006 Thorsten Kukuk <kukuk@suse.de>
|
||||
#
|
||||
|
@ -10,15 +10,3 @@ diff -ruN a/doc/Makefile.am b/doc/Makefile.am
|
|||
|
||||
CLEANFILES = *~
|
||||
DISTCLEANFILES = custom-html.xsl custom-man.xsl
|
||||
diff -ruN a/Makefile.am b/Makefile.am
|
||||
--- a/Makefile.am 2024-01-17 19:29:36.000000000 +0900
|
||||
+++ b/Makefile.am 2024-03-15 14:08:14.914704213 +0900
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
AUTOMAKE_OPTIONS = 1.9 gnu dist-xz no-dist-gzip check-news
|
||||
|
||||
-SUBDIRS = libpam tests libpamc libpam_misc modules po conf xtests
|
||||
+SUBDIRS = libpam tests libpamc libpam_misc modules po doc xtests
|
||||
|
||||
if HAVE_DOC
|
||||
SUBDIRS += doc
|
||||
|
|
|
@ -1,30 +0,0 @@
|
|||
From 470b5bdd8fd29d6b35e3a80f9a57bdd4b2438200 Mon Sep 17 00:00:00 2001
|
||||
From: Tobias Stoeckmann <tobias@stoeckmann.org>
|
||||
Date: Fri, 19 Jan 2024 10:09:00 +0100
|
||||
Subject: [PATCH] pam_unix: do not warn if password aging is disabled
|
||||
|
||||
Later checks will print a warning if daysleft is 0. If password
|
||||
aging is disabled, leave daysleft at -1.
|
||||
|
||||
Resolves: https://github.com/linux-pam/linux-pam/issues/743
|
||||
Fixes: 9ebc14085a3b ("pam_unix: allow disabled password aging")
|
||||
Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
|
||||
---
|
||||
modules/pam_unix/passverify.c | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/modules/pam_unix/passverify.c b/modules/pam_unix/passverify.c
|
||||
index 5c4f862e..1bc98fa2 100644
|
||||
--- a/modules/pam_unix/passverify.c
|
||||
+++ b/modules/pam_unix/passverify.c
|
||||
@@ -314,7 +314,6 @@ PAMH_ARG_DECL(int check_shadow_expiry,
|
||||
}
|
||||
if (spent->sp_lstchg < 0) {
|
||||
D(("password aging disabled"));
|
||||
- *daysleft = 0;
|
||||
return PAM_SUCCESS;
|
||||
}
|
||||
if (curdays < spent->sp_lstchg) {
|
||||
--
|
||||
2.43.0
|
||||
|
2
pam.spec
2
pam.spec
|
@ -55,8 +55,6 @@ Patch508: Linux-PAM-0.99.3.0-pamtimestampadm.patch
|
|||
Patch702: Linux-PAM-1.6.0-add-now-missing-nis-constant.patch
|
||||
# (akdengi> add user to default group users which need for Samba
|
||||
Patch801: Linux-PAM-1.1.4-group_add_users.patch
|
||||
# Fix "Warning: your password will expire in 0 days"
|
||||
Patch804: pam-1.6.0-unix-warn-passwd.patch
|
||||
|
||||
%if %{with selinux}
|
||||
BuildRequires: selinux-devel >= 2.1.6-7
|
||||
|
|
Loading…
Add table
Reference in a new issue