Source: ecryptfs-utils Version: 111-6 Severity: normal Tags: patch User: helm...@debian.org Usertags: dep17m2
Please find a patch attached to install aliased 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 ecryptfs-utils-111/debian/changelog ecryptfs-utils-111/debian/changelog --- ecryptfs-utils-111/debian/changelog 2022-12-19 19:46:40.000000000 +0100 +++ ecryptfs-utils-111/debian/changelog 2024-01-09 20:57:14.000000000 +0100 @@ -1,3 +1,10 @@ +ecryptfs-utils (111-6.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Install aliases files into /usr (DEP17 M2) (Closes: #-1) + + -- Chris Hofstaedtler <z...@debian.org> Tue, 09 Jan 2024 20:57:14 +0100 + ecryptfs-utils (111-6) unstable; urgency=medium [ Andreas Metzler <ametz...@bebt.de> ] diff -Nru ecryptfs-utils-111/debian/ecryptfs-utils.install ecryptfs-utils-111/debian/ecryptfs-utils.install --- ecryptfs-utils-111/debian/ecryptfs-utils.install 2013-02-09 08:05:28.000000000 +0100 +++ ecryptfs-utils-111/debian/ecryptfs-utils.install 2024-01-09 20:55:31.000000000 +0100 @@ -1,7 +1,7 @@ -lib/*/security -sbin +sbin/* usr/sbin/ usr/bin usr/lib/*/ecryptfs +usr/lib/*/security usr/share/doc usr/share/ecryptfs-utils usr/share/locale diff -Nru ecryptfs-utils-111/debian/ecryptfs-utils.lintian-overrides ecryptfs-utils-111/debian/ecryptfs-utils.lintian-overrides --- ecryptfs-utils-111/debian/ecryptfs-utils.lintian-overrides 2022-12-19 19:46:40.000000000 +0100 +++ ecryptfs-utils-111/debian/ecryptfs-utils.lintian-overrides 2024-01-09 20:55:08.000000000 +0100 @@ -1,3 +1,3 @@ # false positives -ecryptfs-utils: elevated-privileges 4755 root/root [sbin/mount.ecryptfs_private] +ecryptfs-utils: elevated-privileges 4755 root/root [usr/sbin/mount.ecryptfs_private] ecryptfs-utils: executable-not-elf-or-script [usr/share/ecryptfs-utils/ecryptfs-record-passphrase] diff -Nru ecryptfs-utils-111/debian/rules ecryptfs-utils-111/debian/rules --- ecryptfs-utils-111/debian/rules 2020-06-16 21:31:59.000000000 +0200 +++ ecryptfs-utils-111/debian/rules 2024-01-09 20:54:55.000000000 +0100 @@ -21,7 +21,7 @@ dh_auto_configure -- \ --enable-gpg --enable-pam --enable-static --enable-tspi \ --disable-gui --disable-openssl --disable-pkcs11-helper \ - --disable-pywrap \ + --disable-pywrap --with-pamdir=/usr/lib/$(DEB_HOST_MULTIARCH)/security \ CFLAGS="$(CFLAGS)" override_dh_auto_install: @@ -30,7 +30,7 @@ install -D -m 0644 debian/local/ecryptfs-utils.pam-auth-update debian/ecryptfs-utils/usr/share/pam-configs/ecryptfs-utils # Adding kmod integration - install -D -m 0644 debian/local/ecryptfs-utils.kmod debian/ecryptfs-utils/lib/modules-load.d/ecryptfs.conf + install -D -m 0644 debian/local/ecryptfs-utils.kmod debian/ecryptfs-utils/usr/lib/modules-load.d/ecryptfs.conf # Removing useless files rm -f debian/tmp/usr/lib/*/*.la @@ -38,7 +38,7 @@ override_dh_fixperms: dh_fixperms - chmod 4755 debian/ecryptfs-utils/sbin/mount.ecryptfs_private + chmod 4755 debian/ecryptfs-utils/usr/sbin/mount.ecryptfs_private override_dh_install: dh_install --fail-missing
