commit:     dafe17091a2bfa128ee7f706d63e76cc42e4c58f
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 21:09:36 2024 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 21:12:06 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dafe1709

sys-apps/systemd-utils: disable auto-cleanup of /tmp and /var/tmp

This can go awry when people have non-standard mount options for these
paths.

Closes: https://bugs.gentoo.org/910233
Bug: https://bugs.gentoo.org/916623
Closes: https://bugs.gentoo.org/917777
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-apps/systemd-utils/files/tmp.conf                                 | 2 ++
 .../{systemd-utils-254.10.ebuild => systemd-utils-254.10-r1.ebuild}   | 4 ++--
 .../{systemd-utils-254.8.ebuild => systemd-utils-254.8-r1.ebuild}     | 4 ++--
 sys-apps/systemd-utils/systemd-utils-255.4.ebuild                     | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/sys-apps/systemd-utils/files/tmp.conf 
b/sys-apps/systemd-utils/files/tmp.conf
new file mode 100644
index 000000000000..9f3d19bb7a2d
--- /dev/null
+++ b/sys-apps/systemd-utils/files/tmp.conf
@@ -0,0 +1,2 @@
+q /tmp 1777 root root
+q /var/tmp 1777 root root

diff --git a/sys-apps/systemd-utils/systemd-utils-254.10.ebuild 
b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
similarity index 99%
rename from sys-apps/systemd-utils/systemd-utils-254.10.ebuild
rename to sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
index 93436b880f05..80c11bee8adc 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.10.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.10-r1.ebuild
@@ -517,8 +517,8 @@ multilib_src_install_all() {
                insinto /usr/share/zsh/site-functions
                doins shell-completion/zsh/_systemd-tmpfiles
                insinto /usr/lib/tmpfiles.d
-               doins tmpfiles.d/{tmp,x11}.conf
-               doins "${FILESDIR}"/legacy.conf
+               doins tmpfiles.d/x11.conf
+               doins "${FILESDIR}"/{legacy,tmp}.conf
        fi
        if use udev; then
                doheader src/libudev/libudev.h

diff --git a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild 
b/sys-apps/systemd-utils/systemd-utils-254.8-r1.ebuild
similarity index 99%
rename from sys-apps/systemd-utils/systemd-utils-254.8.ebuild
rename to sys-apps/systemd-utils/systemd-utils-254.8-r1.ebuild
index b73e1d640a89..bbe8dec823b3 100644
--- a/sys-apps/systemd-utils/systemd-utils-254.8.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-254.8-r1.ebuild
@@ -518,8 +518,8 @@ multilib_src_install_all() {
                insinto /usr/share/zsh/site-functions
                doins shell-completion/zsh/_systemd-tmpfiles
                insinto /usr/lib/tmpfiles.d
-               doins tmpfiles.d/{tmp,x11}.conf
-               doins "${FILESDIR}"/legacy.conf
+               doins tmpfiles.d/x11.conf
+               doins "${FILESDIR}"/{legacy,tmp}.conf
        fi
        if use udev; then
                doheader src/libudev/libudev.h

diff --git a/sys-apps/systemd-utils/systemd-utils-255.4.ebuild 
b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
index b258f5748243..a4f60f47e7f3 100644
--- a/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
+++ b/sys-apps/systemd-utils/systemd-utils-255.4.ebuild
@@ -517,8 +517,8 @@ multilib_src_install_all() {
                insinto /usr/share/zsh/site-functions
                doins shell-completion/zsh/_systemd-tmpfiles
                insinto /usr/lib/tmpfiles.d
-               doins tmpfiles.d/{tmp,x11}.conf
-               doins "${FILESDIR}"/legacy.conf
+               doins tmpfiles.d/x11.conf
+               doins "${FILESDIR}"/{legacy,tmp}.conf
        fi
        if use udev; then
                doheader src/libudev/libudev.h

Reply via email to