diff --git a/debian/patches/debian/configure-always-pick-usr-bin-passwd.patch b/debian/patches/debian/configure-always-pick-usr-bin-passwd.patch new file mode 100644 index 00000000..a1dfa660 --- /dev/null +++ b/debian/patches/debian/configure-always-pick-usr-bin-passwd.patch @@ -0,0 +1,28 @@ +From: Chris Hofstaedtler +Date: Mon, 24 Feb 2025 12:01:18 +0100 +Subject: configure: always pick /usr/bin/passwd + +Improve reproducibility, without Build-Depend:ing on ourselves. +--- + configure.ac | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) + +diff --git a/configure.ac b/configure.ac +index a7388e7..2a6591a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -150,13 +150,7 @@ AC_DEFINE_UNQUOTED(LASTLOG_FILE, "$shadow_cv_logdir/lastlog", + AC_DEFINE_UNQUOTED(FAILLOG_FILE, "$shadow_cv_logdir/faillog", + [Path for faillog file.]) + +-AC_CACHE_CHECK([location of the passwd program], shadow_cv_passwd_dir, +-[if test -f /usr/bin/passwd; then +- shadow_cv_passwd_dir=/usr/bin +-else +- shadow_cv_passwd_dir=/bin +-fi]) +-AC_DEFINE_UNQUOTED(PASSWD_PROGRAM, "$shadow_cv_passwd_dir/passwd", ++AC_DEFINE_UNQUOTED(PASSWD_PROGRAM, "$prefix/bin/passwd", + [Path to passwd program.]) + + AC_ARG_ENABLE(shadowgrp, diff --git a/debian/patches/series b/debian/patches/series index a24f01a2..45dc7d97 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,6 +6,7 @@ debian/tests-disable-su.patch debian/Adapt-login.defs-for-Debian.patch debian/Define-LOGIN_NAME_MAX-on-HURD.patch debian/Stop-building-programs-we-do-not-install.patch +debian/configure-always-pick-usr-bin-passwd.patch upstream/a015e919834c90b99947829c6c823f7fe93a8097-E_BAD_NAME.patch upstream/man-useradd.8.xml-Document-new-exit-code-19-E_BAD_NAME.patch upstream/Revert-lib-src-Use-local-time-for-human-readable-dates.patch