diff --git a/pam-1.5.0-redhat-modules.patch b/pam-1.5.0-redhat-modules.patch deleted file mode 100644 index fe03adb..0000000 --- a/pam-1.5.0-redhat-modules.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up Linux-PAM-1.5.0/configure.ac.redhat-modules Linux-PAM-1.5.0/configure.ac ---- Linux-PAM-1.5.0/configure.ac.redhat-modules 2020-11-11 11:21:21.947857371 +0100 -+++ Linux-PAM-1.5.0/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_console/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.0/modules/Makefile.am.redhat-modules Linux-PAM-1.5.0/modules/Makefile.am ---- Linux-PAM-1.5.0/modules/Makefile.am.redhat-modules 2020-11-10 16:46:13.000000000 +0100 -+++ Linux-PAM-1.5.0/modules/Makefile.am 2020-11-11 11:21:21.947857371 +0100 -@@ -47,6 +47,9 @@ SUBDIRS := \ - pam_debug \ - pam_deny \ - pam_echo \ -+ pam_chroot \ -+ pam_console \ -+ pam_postgresok \ - pam_env \ - pam_exec \ - pam_faildelay \ diff --git a/pam-1.5.2-redhat-modules.patch b/pam-1.5.2-redhat-modules.patch new file mode 100644 index 0000000..0cf8295 --- /dev/null +++ b/pam-1.5.2-redhat-modules.patch @@ -0,0 +1,24 @@ +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 \ diff --git a/pam.spec b/pam.spec index 48df2a6..65e5e07 100644 --- a/pam.spec +++ b/pam.spec @@ -1,13 +1,13 @@ %global so_ver 0 -%global pam_redhat_version 1.1.5 +%global pam_redhat_version 1.2.0 Summary: An extensible library which provides authentication for applications Name: pam Version: 1.5.2 -Release: 16%{?dist} +Release: 17%{?dist} # The library is BSD licensed with option to relicense as GPLv2+ # - this option is redundant as the BSD license allows that anyway. -# pam_timestamp, pam_loginuid, and pam_console modules are GPLv2+. +# pam_timestamp and pam_loginuid modules are GPLv2+. License: BSD-3-Clause AND GPL-2.0-or-later URL: http://www.linux-pam.org/ Source0: https://github.com/linux-pam/linux-pam/releases/download/v%{version}/Linux-PAM-%{version}.tar.xz @@ -22,7 +22,7 @@ Source13: config-util.5 Source15: pamtmp.conf Source17: postlogin.5 Source18: https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt -Patch1: pam-1.5.0-redhat-modules.patch +Patch1: pam-1.5.2-redhat-modules.patch Patch2: pam-1.5.0-noflex.patch Patch3: pam-1.3.0-unix-nomsg.patch Patch4: pam-1.5.2-pwhistory-config.patch @@ -250,7 +250,6 @@ done %config(noreplace) %{_pam_confdir}/other %config(noreplace) %{_pam_confdir}/config-util %{_rpmconfigdir}/macros.d/macros.%{name} -%{_sbindir}/pam_console_apply %{_sbindir}/pam_namespace_helper %{_sbindir}/faillock %attr(4755,root,root) %{_sbindir}/pam_timestamp_check @@ -261,7 +260,6 @@ done %dir %{_pam_moduledir} %{_pam_moduledir}/pam_access.so %{_pam_moduledir}/pam_chroot.so -%{_pam_moduledir}/pam_console.so %{_pam_moduledir}/pam_debug.so %{_pam_moduledir}/pam_deny.so %{_pam_moduledir}/pam_echo.so @@ -316,8 +314,6 @@ done %dir %{_pam_secconfdir} %config(noreplace) %{_pam_secconfdir}/access.conf %config(noreplace) %{_pam_secconfdir}/chroot.conf -%config %{_pam_secconfdir}/console.perms -%config(noreplace) %{_pam_secconfdir}/console.handlers %config(noreplace) %{_pam_secconfdir}/faillock.conf %config(noreplace) %{_pam_secconfdir}/group.conf %config(noreplace) %{_pam_secconfdir}/limits.conf @@ -329,9 +325,6 @@ done %config(noreplace) %{_pam_secconfdir}/pwhistory.conf %config(noreplace) %{_pam_secconfdir}/time.conf %config(noreplace) %{_pam_secconfdir}/opasswd -%dir %{_pam_secconfdir}/console.apps -%dir %{_pam_secconfdir}/console.perms.d -%dir /var/run/console %config(noreplace) %{_pam_secconfdir}/sepermit.conf %dir /var/run/sepermit %dir /var/run/faillock @@ -362,6 +355,10 @@ done %{_pam_libdir}/libpam_misc.so.%{so_ver}* %changelog +* Thu Feb 9 2023 Iker Pedrosa - 1.5.2-17 +- Remove pam_console (#2166692) +- Rebase to pam-redhat-1.2.0 + * Thu Jan 19 2023 Fedora Release Engineering - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index e3d37d7..c782b8e 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (Linux-PAM-1.5.2.tar.xz) = fa16350c132d3e5fb82b60d991768fb596582639841b8ece645c684705467305ccf1302a0147ec222ab78c01b2c9114c5496dc1ca565d2b56bf315f29a815144 SHA512 (Linux-PAM-1.5.2.tar.xz.asc) = 5e4d9ac533651a9479ef26719430c1fdf31e2b70de859a4f09b17f9e14e8fb25d74a059332841dc8ed9db764971c3e4d9941d613a7bfbb6450122462810109ad -SHA512 (pam-redhat-1.1.5.tar.xz) = b93b80e9aa0dd8b38045b2a8cc36006b1b651a2724e64fcd9ed87af1fc36008acf9e62e2950097bebfccd657a064b748311f4b9c826f76d7b8c4299feb070bb8 +SHA512 (pam-redhat-1.2.0.tar.xz) = f676a6c8df0cf3836018b1a67ded1d40937b88ff046e5c6b22bac46cb05e27970ef6a7ce224269e4c0d1ca9375c72e77880cf9114e936a7de9c423bf443d27ee