From e7ecdaecb3eb07077aaddaed6b73c23fcaf92b80 Mon Sep 17 00:00:00 2001 From: Reno Reckling Date: Thu, 8 Jan 2026 01:00:16 +0100 Subject: [PATCH] nss_pam_ldapd: fix C23 compatibility Rename 'bool' variable to 'value' in print_boolean() function since 'bool' is now a reserved keyword in C23. Upstream patch: https://bugs.debian.org/1097481 Co-Authored-By: Claude Opus 4.5 --- .../nss_pam_ldapd/fix-bool-c23-keyword.patch | 31 +++++++++++++++++++ pkgs/by-name/ns/nss_pam_ldapd/package.nix | 5 +++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/by-name/ns/nss_pam_ldapd/fix-bool-c23-keyword.patch diff --git a/pkgs/by-name/ns/nss_pam_ldapd/fix-bool-c23-keyword.patch b/pkgs/by-name/ns/nss_pam_ldapd/fix-bool-c23-keyword.patch new file mode 100644 index 000000000000..9a461f098fbe --- /dev/null +++ b/pkgs/by-name/ns/nss_pam_ldapd/fix-bool-c23-keyword.patch @@ -0,0 +1,31 @@ +From 8ddb983a546f632986a84a784c4625110f7782a2 Mon Sep 17 00:00:00 2001 +From: Arthur de Jong +Date: Sun, 23 Feb 2025 15:22:38 +0100 +Subject: Fix variable name (bool) which is a keyword in C23 + +Closes https://bugs.debian.org/1097481 +--- + nslcd/cfg.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/nslcd/cfg.c b/nslcd/cfg.c +index ded797a..b984b0e 100644 +--- a/nslcd/cfg.c ++++ b/nslcd/cfg.c +@@ -207,10 +207,10 @@ static int get_boolean(const char *filename, int lnr, + return parse_boolean(filename, lnr, token); + } + +-static const char *print_boolean(int bool) ++static const char *print_boolean(int value) + { +- if (bool) return "yes"; +- else return "no"; ++ if (value) return "yes"; ++ else return "no"; + } + + #define TIME_MINUTES 60 +-- +cgit v1.2.3 + diff --git a/pkgs/by-name/ns/nss_pam_ldapd/package.nix b/pkgs/by-name/ns/nss_pam_ldapd/package.nix index d00e085ebfb4..1ec8d96f46e3 100644 --- a/pkgs/by-name/ns/nss_pam_ldapd/package.nix +++ b/pkgs/by-name/ns/nss_pam_ldapd/package.nix @@ -19,6 +19,11 @@ stdenv.mkDerivation rec { sha256 = "sha256-4BeE4Xy1M7tmvQYB4gXnhSY0RcPC33pvkCMqtBMccW0="; }; + patches = [ + # Fix C23 compatibility: rename 'bool' variable which is now a keyword + ./fix-bool-c23-keyword.patch + ]; + nativeBuildInputs = [ pkg-config makeWrapper