diff --git a/debian/patches/debian/configure.ac-align-exec_prefix-with-prefix.patch b/debian/patches/debian/configure.ac-align-exec_prefix-with-prefix.patch new file mode 100644 index 00000000..ab00010f --- /dev/null +++ b/debian/patches/debian/configure.ac-align-exec_prefix-with-prefix.patch @@ -0,0 +1,23 @@ +From: Chris Hofstaedtler +Date: Mon, 24 Feb 2025 23:24:41 +0100 +Subject: configure.ac: align exec_prefix with prefix + +Hopefully upstream will fix this one day. +Reported as https://github.com/shadow-maint/shadow/issues/1229 +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 36c57d8..8a9c05a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -18,7 +18,7 @@ AC_SUBST([LIBSUBID_ABI], [libsubid_abi]) + + dnl Some hacks... + test "$prefix" = "NONE" && prefix="/usr" +-test "$prefix" = "/usr" && exec_prefix="" ++test "$prefix" = "/usr" && exec_prefix="/usr" + + AC_USE_SYSTEM_EXTENSIONS + diff --git a/debian/patches/debian/configure.ac-be-deterministic-about-passwd-location.patch b/debian/patches/debian/configure.ac-be-deterministic-about-passwd-location.patch index 4ec9ede2..5c1df6c4 100644 --- a/debian/patches/debian/configure.ac-be-deterministic-about-passwd-location.patch +++ b/debian/patches/debian/configure.ac-be-deterministic-about-passwd-location.patch @@ -10,7 +10,7 @@ Forwarded: https://github.com/shadow-maint/shadow/issues/1224 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac -index 36c57d8..94fef7e 100644 +index 8a9c05a..b7cc59c 100644 --- a/configure.ac +++ b/configure.ac @@ -115,13 +115,7 @@ AC_DEFINE_UNQUOTED(LASTLOG_FILE, "$shadow_cv_logdir/lastlog", diff --git a/debian/patches/series b/debian/patches/series index 0b724d5f..caf70255 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -7,6 +7,7 @@ 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/Warn-when-badname-and-variants-are-given.patch +debian/configure.ac-align-exec_prefix-with-prefix.patch debian/configure.ac-be-deterministic-about-passwd-location.patch upstream/Revert-lib-src-Use-local-time-for-human-readable-dates.patch upstream/src-chfn.c-Partially-revert-lib-src-Use-strsep-3-instead-.patch diff --git a/debian/rules b/debian/rules index 417c68f1..13a9329e 100755 --- a/debian/rules +++ b/debian/rules @@ -10,6 +10,8 @@ include /usr/share/debhelper/dh_package_notes/package-notes.mk # Adds extra options when calling the configure script: DEB_CONFIGURE_EXTRA_FLAGS := \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ --mandir=/usr/share/man \ --with-libpam \ --with-yescrypt \ diff --git a/debian/uidmap.install b/debian/uidmap.install index 38246485..3807888e 100644 --- a/debian/uidmap.install +++ b/debian/uidmap.install @@ -1,3 +1,3 @@ -bin/getsubids usr/bin +usr/bin/getsubids usr/bin/newgidmap usr/bin/newuidmap