Source: duo-unix
Version: 1.11.3-1
Severity: normal
Tags: patch
User: helm...@debian.org
Usertags: dep17m2
Please find a patch attached to install files into /usr, for
the currently ongoing UsrMerge effort [1].
It has been build-tested and checked by dumat.
Please review it and upload to unstable during the trixie cycle,
preferably before the time_t-64bit transition.
Note: this should not be backported to bookworm. If you intend to
backport, please use dh_movetousr instead.
If your package will change for the t64 transition or otherwise
rename/split/move its binaries (packages) during trixie, please
then upload to experimental and get in touch with the UsrMerge
driver, please see the wiki [1].
Chris
[1] https://wiki.debian.org/UsrMerge
diff -Nru duo-unix-1.11.3/debian/changelog duo-unix-1.11.3/debian/changelog
--- duo-unix-1.11.3/debian/changelog 2020-03-14 18:08:43.000000000 +0100
+++ duo-unix-1.11.3/debian/changelog 2024-01-09 20:51:24.000000000 +0100
@@ -1,3 +1,10 @@
+duo-unix (1.11.3-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Install aliased files into /usr (DEP17 M2) (Closes: #-1)
+
+ -- Chris Hofstaedtler <z...@debian.org> Tue, 09 Jan 2024 20:51:24 +0100
+
duo-unix (1.11.3-1) unstable; urgency=medium
* New upstream release (Closes: 952392).
diff -Nru duo-unix-1.11.3/debian/libpam-duo.install duo-unix-1.11.3/debian/libpam-duo.install
--- duo-unix-1.11.3/debian/libpam-duo.install 2011-09-02 22:21:02.000000000 +0200
+++ duo-unix-1.11.3/debian/libpam-duo.install 2024-01-09 20:51:24.000000000 +0100
@@ -1,3 +1,3 @@
-lib/*/security/pam_duo.so
+usr/lib/*/security/pam_duo.so
debian/pam-configs/* usr/share/pam-configs/
debian/pam_duo.conf etc/security/
diff -Nru duo-unix-1.11.3/debian/not-installed duo-unix-1.11.3/debian/not-installed
--- duo-unix-1.11.3/debian/not-installed 2020-03-14 18:08:43.000000000 +0100
+++ duo-unix-1.11.3/debian/not-installed 2024-01-09 20:51:24.000000000 +0100
@@ -1,7 +1,7 @@
# We use the debian-specific version from debian/pam_duo.conf instead.
etc/security/pam_duo.conf
# We don't need .la files for linking
-lib/x86_64-linux-gnu/security/pam_duo.la
+usr/lib/x86_64-linux-gnu/security/pam_duo.la
usr/lib/x86_64-linux-gnu/libduo.la
# We do not support static linking.
usr/lib/x86_64-linux-gnu/libduo.a
diff -Nru duo-unix-1.11.3/debian/rules duo-unix-1.11.3/debian/rules
--- duo-unix-1.11.3/debian/rules 2020-03-14 18:08:43.000000000 +0100
+++ duo-unix-1.11.3/debian/rules 2024-01-09 20:51:24.000000000 +0100
@@ -11,7 +11,7 @@
dh $@
override_dh_auto_configure:
- dh_auto_configure -- --with-pam=/lib/$(DEB_HOST_MULTIARCH)/security \
+ dh_auto_configure -- --with-pam=/usr/lib/$(DEB_HOST_MULTIARCH)/security \
--sysconfdir=/etc/security \
--includedir=\$${prefix}/include/duo
