From 33048e96a1bec1c8434cf00c8bf87285006d60f6 Mon Sep 17 00:00:00 2001
From: Caleb Xu <calebcenter@live.com>
Date: Sat, 14 Jun 2025 08:36:33 -0400
Subject: [PATCH 1/2] gh-135497: fix MAXLOGNAME detection in configure

---
 .../next/Build/2025-06-14-10-32-11.gh-issue-135497.ajlV4F.rst   | 1 +
 .../next/Library/2025-06-14-14-19-13.gh-issue-135497.1pzwdA.rst | 1 +
 configure                                                       | 2 +-
 configure.ac                                                    | 2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 Misc/NEWS.d/next/Build/2025-06-14-10-32-11.gh-issue-135497.ajlV4F.rst
 create mode 100644 Misc/NEWS.d/next/Library/2025-06-14-14-19-13.gh-issue-135497.1pzwdA.rst

diff --git a/Misc/NEWS.d/next/Build/2025-06-14-10-32-11.gh-issue-135497.ajlV4F.rst b/Misc/NEWS.d/next/Build/2025-06-14-10-32-11.gh-issue-135497.ajlV4F.rst
new file mode 100644
index 00000000000000..7ad201396a2e42
--- /dev/null
+++ b/Misc/NEWS.d/next/Build/2025-06-14-10-32-11.gh-issue-135497.ajlV4F.rst
@@ -0,0 +1 @@
+Fix the detection of ``MAXLOGNAME`` in the configure script.
diff --git a/Misc/NEWS.d/next/Library/2025-06-14-14-19-13.gh-issue-135497.1pzwdA.rst b/Misc/NEWS.d/next/Library/2025-06-14-14-19-13.gh-issue-135497.1pzwdA.rst
new file mode 100644
index 00000000000000..d3e81de9dbfd34
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2025-06-14-14-19-13.gh-issue-135497.1pzwdA.rst
@@ -0,0 +1 @@
+Fix :func:`os.getlogin` failing for longer usernames on BSD-based platforms.
diff --git a/configure b/configure
index fef9f2d7da935c..6c4923e82a886d 100755
--- a/configure
+++ b/configure
@@ -23849,7 +23849,7 @@ fi
 
 
 
-ac_fn_check_decl "$LINENO" "MAXLOGNAME" "ac_cv_have_decl_MAXLOGNAME" "#include <sys/params.h>
+ac_fn_check_decl "$LINENO" "MAXLOGNAME" "ac_cv_have_decl_MAXLOGNAME" "#include <sys/param.h>
 " "$ac_c_undeclared_builtin_options" "CFLAGS"
 if test "x$ac_cv_have_decl_MAXLOGNAME" = xyes
 then :
diff --git a/configure.ac b/configure.ac
index cc37a636c522ba..4f935aacef1665 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5542,7 +5542,7 @@ AC_CHECK_DECL([MAXLOGNAME],
               [AC_DEFINE([HAVE_MAXLOGNAME], [1],
                          [Define if you have the 'MAXLOGNAME' constant.])],
               [],
-              [@%:@include <sys/params.h>])
+              [@%:@include <sys/param.h>])
 
 AC_CHECK_DECLS([UT_NAMESIZE],
               [AC_DEFINE([HAVE_UT_NAMESIZE], [1],

From d6a3aa7535882d204730206314aa3f7186db2ed8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?B=C3=A9n=C3=A9dikt=20Tran?=
 <10796600+picnixz@users.noreply.github.com>
Date: Sat, 14 Jun 2025 17:47:02 +0200
Subject: [PATCH 2/2] Update
 Misc/NEWS.d/next/Build/2025-06-14-10-32-11.gh-issue-135497.ajlV4F.rst

---
 .../next/Build/2025-06-14-10-32-11.gh-issue-135497.ajlV4F.rst   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Misc/NEWS.d/next/Build/2025-06-14-10-32-11.gh-issue-135497.ajlV4F.rst b/Misc/NEWS.d/next/Build/2025-06-14-10-32-11.gh-issue-135497.ajlV4F.rst
index 7ad201396a2e42..c84663b14668d6 100644
--- a/Misc/NEWS.d/next/Build/2025-06-14-10-32-11.gh-issue-135497.ajlV4F.rst
+++ b/Misc/NEWS.d/next/Build/2025-06-14-10-32-11.gh-issue-135497.ajlV4F.rst
@@ -1 +1 @@
-Fix the detection of ``MAXLOGNAME`` in the configure script.
+Fix the detection of ``MAXLOGNAME`` in the ``configure.ac`` script.