Merge pull request #303456 from trofi/pam-update

pam: 1.6.0 -> 1.6.1
This commit is contained in:
Mario Rodas 2024-04-15 02:04:34 -05:00 committed by GitHub
commit 9e068dbced
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -1,4 +1,4 @@
{ lib, stdenv, buildPackages, fetchurl, fetchpatch
{ lib, stdenv, buildPackages, fetchurl
, flex, cracklib, db4, gettext, audit, libxcrypt
, nixosTests
, autoreconfHook269, pkg-config-unwrapped
@ -6,31 +6,15 @@
stdenv.mkDerivation rec {
pname = "linux-pam";
version = "1.6.0";
version = "1.6.1";
src = fetchurl {
url = "https://github.com/linux-pam/linux-pam/releases/download/v${version}/Linux-PAM-${version}.tar.xz";
hash = "sha256-//SjTlu+534ujxmS8nYx4jKby/igVj3etcM4m04xaa0=";
hash = "sha256-+JI8dAFZBS1xnb/CovgZQtaN00/K9hxwagLJuA/u744=";
};
patches = [
./suid-wrapper-path.patch
# Backport fix for missing include breaking musl builds.
(fetchpatch {
name = "pam_namespace-stdint.h.patch";
url = "https://github.com/linux-pam/linux-pam/commit/cc9d40b7cdbd3e15ccaa324a0dda1680ef9dea13.patch";
hash = "sha256-tCnH2yPO4dBbJOZA0fP2gm1EavHRMEJyfzB5Vy7YjAA=";
})
# Resotre handling of empty passwords:
# https://github.com/linux-pam/linux-pam/pull/784
# TODO: drop upstreamed patch on 1.6.1 update.
(fetchpatch {
name = "revert-unconditional-helper.patch";
url = "https://github.com/linux-pam/linux-pam/commit/8d0c575336ad301cd14e16ad2fdec6fe621764b8.patch";
hash = "sha256-z9KfMxxqXQVnmNaixaVjLnQqaGsH8MBHhHbiP/8fvhE=";
})
];
# Case-insensitivity workaround for https://github.com/linux-pam/linux-pam/issues/569