diff --git a/pam-1.3.1-unix-remove-obsolete-_unix_read_password-prototype.patch b/pam-1.3.1-unix-remove-obsolete-_unix_read_password-prototype.patch new file mode 100644 index 0000000..14f285d --- /dev/null +++ b/pam-1.3.1-unix-remove-obsolete-_unix_read_password-prototype.patch @@ -0,0 +1,34 @@ +From a2b72aeb86f297d349bc9e6a8f059fedf97a499a Mon Sep 17 00:00:00 2001 +From: "Dmitry V. Levin" +Date: Thu, 31 May 2018 00:20:18 +0000 +Subject: [PATCH] pam_unix: remove obsolete _unix_read_password prototype + +The function was removed by commit Linux-PAM-1.3.0~5 +so the function prototype should go as well. + +* modules/pam_unix/support.h (_unix_read_password): Remove. + +Complements: 7e09188c5dc4 ("pam_unix: Use pam_get_authtok() instead of +direct pam_prompt() calls.") +--- + modules/pam_unix/support.h | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/modules/pam_unix/support.h b/modules/pam_unix/support.h +index b4c279c3..543e9b9f 100644 +--- a/modules/pam_unix/support.h ++++ b/modules/pam_unix/support.h +@@ -164,13 +164,6 @@ extern int _unix_blankpasswd(pam_handle_t *pamh,unsigned int ctrl, + const char *name); + extern int _unix_verify_password(pam_handle_t * pamh, const char *name + ,const char *p, unsigned int ctrl); +-extern int _unix_read_password(pam_handle_t * pamh +- ,unsigned int ctrl +- ,const char *comment +- ,const char *prompt1 +- ,const char *prompt2 +- ,const char *data_name +- ,const void **pass); + + extern int _unix_run_verify_binary(pam_handle_t *pamh, + unsigned int ctrl, const char *user, int *daysleft); diff --git a/pam.spec b/pam.spec index 6f1d047..4acc320 100644 --- a/pam.spec +++ b/pam.spec @@ -3,7 +3,7 @@ Summary: An extensible library which provides authentication for applications Name: pam Version: 1.3.1 -Release: 8%{?dist} +Release: 9%{?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+. @@ -44,6 +44,8 @@ Patch32: pam-1.2.1-console-devname.patch Patch33: pam-1.3.0-unix-nomsg.patch Patch34: pam-1.3.1-coverity.patch Patch35: pam-1.3.1-console-build.patch +# https://github.com/linux-pam/linux-pam/commit/a2b72aeb86f297d349bc9e6a8f059fedf97a499a +Patch36: pam-1.3.1-unix-remove-obsolete-_unix_read_password-prototype.patch %global _pamlibdir %{_libdir} %global _moduledir %{_libdir}/security @@ -127,6 +129,8 @@ cp %{SOURCE18} . %patch33 -p1 -b .nomsg %patch34 -p1 -b .coverity %patch35 -p1 -b .console-build +%patch36 -p1 -b .remove-prototype + autoreconf -i %build @@ -368,6 +372,9 @@ done %doc doc/specs/rfc86.0.txt %changelog +* Fri Nov 23 2018 Björn Esser - 1.3.1-9 +- Backport upstream commit removing an obsolete prototype + * Fri Nov 16 2018 Björn Esser - 1.3.1-8 - Use %%ldconfig_scriptlets - Drop Requires(post), not needed anymore