Realign left-over patches
Signed-off-by: Björn Esser <besser82@fedoraproject.org>
This commit is contained in:
parent
4a01b974a1
commit
0cfcd0d503
@ -1,24 +0,0 @@
|
|||||||
diff -up Linux-PAM-1.5.0/doc/Makefile.am.noflex Linux-PAM-1.5.0/doc/Makefile.am
|
|
||||||
--- Linux-PAM-1.5.0/doc/Makefile.am.noflex 2020-11-10 16:46:13.000000000 +0100
|
|
||||||
+++ Linux-PAM-1.5.0/doc/Makefile.am 2020-11-11 11:39:00.980421433 +0100
|
|
||||||
@@ -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 = *~
|
|
||||||
|
|
||||||
diff -up Linux-PAM-1.5.0/Makefile.am.noflex Linux-PAM-1.5.0/Makefile.am
|
|
||||||
--- Linux-PAM-1.5.0/Makefile.am.noflex 2020-11-11 11:39:00.980421433 +0100
|
|
||||||
+++ Linux-PAM-1.5.0/Makefile.am 2020-11-11 11:39:15.887625418 +0100
|
|
||||||
@@ -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 examples xtests
|
|
||||||
+SUBDIRS = libpam tests libpamc libpam_misc modules po doc examples xtests
|
|
||||||
|
|
||||||
if HAVE_DOC
|
|
||||||
SUBDIRS += doc
|
|
@ -1,24 +0,0 @@
|
|||||||
diff -up Linux-PAM-1.5.2/configure.ac.redhat-modules Linux-PAM-1.5.2/configure.ac
|
|
||||||
--- Linux-PAM-1.5.2/configure.ac.redhat-modules 2020-11-11 11:21:21.947857371 +0100
|
|
||||||
+++ Linux-PAM-1.5.2/configure.ac 2020-11-11 11:22:58.638193747 +0100
|
|
||||||
@@ -682,6 +682,8 @@ AC_CONFIG_FILES([Makefile libpam/Makefil
|
|
||||||
po/Makefile.in \
|
|
||||||
Make.xml.rules \
|
|
||||||
modules/Makefile \
|
|
||||||
+ modules/pam_chroot/Makefile \
|
|
||||||
+ modules/pam_postgresok/Makefile \
|
|
||||||
modules/pam_access/Makefile \
|
|
||||||
modules/pam_debug/Makefile modules/pam_deny/Makefile \
|
|
||||||
modules/pam_echo/Makefile modules/pam_env/Makefile \
|
|
||||||
diff -up Linux-PAM-1.5.2/modules/Makefile.am.redhat-modules Linux-PAM-1.5.2/modules/Makefile.am
|
|
||||||
--- Linux-PAM-1.5.2/modules/Makefile.am.redhat-modules 2020-11-10 16:46:13.000000000 +0100
|
|
||||||
+++ Linux-PAM-1.5.2/modules/Makefile.am 2020-11-11 11:21:21.947857371 +0100
|
|
||||||
@@ -47,6 +47,8 @@ SUBDIRS := \
|
|
||||||
pam_debug \
|
|
||||||
pam_deny \
|
|
||||||
pam_echo \
|
|
||||||
+ pam_chroot \
|
|
||||||
+ pam_postgresok \
|
|
||||||
pam_env \
|
|
||||||
pam_exec \
|
|
||||||
pam_faildelay \
|
|
26
pam-1.5.3-noflex.patch
Normal file
26
pam-1.5.3-noflex.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
Index: Linux-PAM-1.5.3/doc/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- Linux-PAM-1.5.3.orig/doc/Makefile.am
|
||||||
|
+++ Linux-PAM-1.5.3/doc/Makefile.am
|
||||||
|
@@ -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 = *~
|
||||||
|
|
||||||
|
Index: Linux-PAM-1.5.3/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- Linux-PAM-1.5.3.orig/Makefile.am
|
||||||
|
+++ Linux-PAM-1.5.3/Makefile.am
|
||||||
|
@@ -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 examples xtests
|
||||||
|
+SUBDIRS = libpam tests libpamc libpam_misc modules po doc examples xtests
|
||||||
|
|
||||||
|
if HAVE_DOC
|
||||||
|
SUBDIRS += doc
|
26
pam-1.5.3-redhat-modules.patch
Normal file
26
pam-1.5.3-redhat-modules.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
Index: Linux-PAM-1.5.3/configure.ac
|
||||||
|
===================================================================
|
||||||
|
--- Linux-PAM-1.5.3.orig/configure.ac
|
||||||
|
+++ Linux-PAM-1.5.3/configure.ac
|
||||||
|
@@ -754,6 +754,8 @@ AC_CONFIG_FILES([Makefile libpam/Makefil
|
||||||
|
po/Makefile.in \
|
||||||
|
Make.xml.rules \
|
||||||
|
modules/Makefile \
|
||||||
|
+ modules/pam_chroot/Makefile \
|
||||||
|
+ modules/pam_postgresok/Makefile \
|
||||||
|
modules/pam_access/Makefile \
|
||||||
|
modules/pam_debug/Makefile modules/pam_deny/Makefile \
|
||||||
|
modules/pam_echo/Makefile modules/pam_env/Makefile \
|
||||||
|
Index: Linux-PAM-1.5.3/modules/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- Linux-PAM-1.5.3.orig/modules/Makefile.am
|
||||||
|
+++ Linux-PAM-1.5.3/modules/Makefile.am
|
||||||
|
@@ -47,6 +47,8 @@ SUBDIRS := \
|
||||||
|
pam_debug \
|
||||||
|
pam_deny \
|
||||||
|
pam_echo \
|
||||||
|
+ pam_chroot \
|
||||||
|
+ pam_postgresok \
|
||||||
|
pam_env \
|
||||||
|
pam_exec \
|
||||||
|
pam_faildelay \
|
@ -1,7 +1,8 @@
|
|||||||
diff -up Linux-PAM-1.3.0/modules/pam_unix/pam_unix_passwd.c.nomsg Linux-PAM-1.3.0/modules/pam_unix/pam_unix_passwd.c
|
Index: Linux-PAM-1.5.3/modules/pam_unix/pam_unix_passwd.c
|
||||||
--- Linux-PAM-1.3.0/modules/pam_unix/pam_unix_passwd.c.nomsg 2016-04-11 13:08:47.000000000 +0200
|
===================================================================
|
||||||
+++ Linux-PAM-1.3.0/modules/pam_unix/pam_unix_passwd.c 2017-04-20 16:51:24.853106709 +0200
|
--- Linux-PAM-1.5.3.orig/modules/pam_unix/pam_unix_passwd.c
|
||||||
@@ -687,12 +687,6 @@ pam_sm_chauthtok(pam_handle_t *pamh, int
|
+++ Linux-PAM-1.5.3/modules/pam_unix/pam_unix_passwd.c
|
||||||
|
@@ -678,12 +678,6 @@ pam_sm_chauthtok(pam_handle_t *pamh, int
|
||||||
return PAM_SUCCESS;
|
return PAM_SUCCESS;
|
||||||
} else if (off(UNIX__IAMROOT, ctrl) ||
|
} else if (off(UNIX__IAMROOT, ctrl) ||
|
||||||
(on(UNIX_NIS, ctrl) && _unix_comesfromsource(pamh, user, 0, 1))) {
|
(on(UNIX_NIS, ctrl) && _unix_comesfromsource(pamh, user, 0, 1))) {
|
7
pam.spec
7
pam.spec
@ -22,9 +22,9 @@ Source13: config-util.5
|
|||||||
Source15: pamtmp.conf
|
Source15: pamtmp.conf
|
||||||
Source17: postlogin.5
|
Source17: postlogin.5
|
||||||
Source18: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
|
Source18: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
|
||||||
Patch1: pam-1.5.2-redhat-modules.patch
|
Patch1: pam-1.5.3-redhat-modules.patch
|
||||||
Patch2: pam-1.5.0-noflex.patch
|
Patch2: pam-1.5.3-noflex.patch
|
||||||
Patch3: pam-1.3.0-unix-nomsg.patch
|
Patch3: pam-1.5.3-unix-nomsg.patch
|
||||||
|
|
||||||
%{load:%{SOURCE3}}
|
%{load:%{SOURCE3}}
|
||||||
|
|
||||||
@ -358,6 +358,7 @@ done
|
|||||||
Resolves: #2196709
|
Resolves: #2196709
|
||||||
- Drop pam-1.5.2-pwhistory-config.patch and pam-1.5.2-configure-c99.patch,
|
- Drop pam-1.5.2-pwhistory-config.patch and pam-1.5.2-configure-c99.patch,
|
||||||
as those patches are implemented upstream
|
as those patches are implemented upstream
|
||||||
|
- Realign left-over patches
|
||||||
|
|
||||||
* Tue Apr 25 2023 Björn Esser <besser82@fedoraproject.org> - 1.5.2-19
|
* Tue Apr 25 2023 Björn Esser <besser82@fedoraproject.org> - 1.5.2-19
|
||||||
- Replace deprecated '%%patchN' with '%%patch -P N'
|
- Replace deprecated '%%patchN' with '%%patch -P N'
|
||||||
|
Loading…
Reference in New Issue
Block a user