diff options
| author | Vladimír Čunát <v@cunat.cz> | 2023-11-11 16:40:07 +0100 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2023-11-11 16:40:07 +0100 |
| commit | b8b231f704b6bb8604d677df7a13ab2da50ebf16 (patch) | |
| tree | 08f5d99f0ee31dae52773620f686c71a7d14e6ab /pkgs/os-specific/linux | |
| parent | 4f431bd1de2580016fb98942877b6a521a2b89b4 (diff) | |
| parent | 60e01874711bcb65a81d21b4647cb160645e3920 (diff) | |
| download | nixpkgs-b8b231f704b6bb8604d677df7a13ab2da50ebf16.tar nixpkgs-b8b231f704b6bb8604d677df7a13ab2da50ebf16.tar.gz nixpkgs-b8b231f704b6bb8604d677df7a13ab2da50ebf16.tar.bz2 nixpkgs-b8b231f704b6bb8604d677df7a13ab2da50ebf16.tar.lz nixpkgs-b8b231f704b6bb8604d677df7a13ab2da50ebf16.tar.xz nixpkgs-b8b231f704b6bb8604d677df7a13ab2da50ebf16.tar.zst nixpkgs-b8b231f704b6bb8604d677df7a13ab2da50ebf16.zip | |
Merge #266828: pam: fix pam_unix autohentication failures when ran as user
...into staging-next
Diffstat (limited to 'pkgs/os-specific/linux')
| -rw-r--r-- | pkgs/os-specific/linux/pam/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/pam/suid-wrapper-path.patch | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/pam/default.nix b/pkgs/os-specific/linux/pam/default.nix index 9a0b2161ce4..a35f40be595 100644 --- a/pkgs/os-specific/linux/pam/default.nix +++ b/pkgs/os-specific/linux/pam/default.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "doc" "man" /* "modules" */ ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - # autoreconfHook269 is needed for `bind-locales.patch` above + # autoreconfHook269 is needed for `suid-wrapper-path.patch` and + # `bind-locales.patch` above. # pkg-config-unwrapped is needed for `AC_CHECK_LIB` and `AC_SEARCH_LIBS` nativeBuildInputs = [ flex autoreconfHook269 pkg-config-unwrapped ] ++ lib.optional stdenv.buildPlatform.isDarwin gettext; diff --git a/pkgs/os-specific/linux/pam/suid-wrapper-path.patch b/pkgs/os-specific/linux/pam/suid-wrapper-path.patch index 71533c51a19..a427ccf3881 100644 --- a/pkgs/os-specific/linux/pam/suid-wrapper-path.patch +++ b/pkgs/os-specific/linux/pam/suid-wrapper-path.patch @@ -1,6 +1,6 @@ It needs the SUID version during runtime, and that can't be in /nix/store/** ---- a/modules/pam_unix/Makefile.in -+++ b/modules/pam_unix/Makefile.in -@@ -651 +651 @@ +--- a/modules/pam_unix/Makefile.am ++++ b/modules/pam_unix/Makefile.am +@@ -21 +21 @@ - -DCHKPWD_HELPER=\"$(sbindir)/unix_chkpwd\" \ + -DCHKPWD_HELPER=\"/run/wrappers/bin/unix_chkpwd\" \ |