From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id EF659138BED for ; Sun, 25 Oct 2015 09:11:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 480C821C004; Sun, 25 Oct 2015 09:11:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E1E5421C004 for ; Sun, 25 Oct 2015 09:11:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AD2F1340890 for ; Sun, 25 Oct 2015 09:11:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E711D1866 for ; Sun, 25 Oct 2015 09:11:11 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1445720916.cff9b423cf44e94d3f370dc81acc53a1cdf78e34.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/files/, sys-apps/systemd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/systemd/files/228-noclean-tmp.patch sys-apps/systemd/systemd-9999.ebuild X-VCS-Directories: sys-apps/systemd/ sys-apps/systemd/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: cff9b423cf44e94d3f370dc81acc53a1cdf78e34 X-VCS-Branch: master Date: Sun, 25 Oct 2015 09:11:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d36d9e57-4eaa-4a28-911a-ca64c4a4ddf0 X-Archives-Hash: 2f9211d5c1156640f4597ed00725eb51 commit: cff9b423cf44e94d3f370dc81acc53a1cdf78e34 Author: Elias Probst eliasprobst eu> AuthorDate: Sat Oct 24 21:08:36 2015 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Oct 24 21:08:36 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cff9b423 sys-apps/systemd: Update `noclean-tmp` patch >From `sys-apps/systemd-228` on, many `tmpfiles.d` definitions were switched from `v` (subvolume) to `q` (subvolume with quota). Package-Manager: portage-2.2.23 sys-apps/systemd/files/228-noclean-tmp.patch | 28 ++++++++++++++++++++++++++++ sys-apps/systemd/systemd-9999.ebuild | 2 +- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/sys-apps/systemd/files/228-noclean-tmp.patch b/sys-apps/systemd/files/228-noclean-tmp.patch new file mode 100644 index 0000000..769aa04 --- /dev/null +++ b/sys-apps/systemd/files/228-noclean-tmp.patch @@ -0,0 +1,28 @@ +From b23c098d5787e06770872b19f83fffa14d8a7d14 Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Fri, 25 Sep 2015 10:26:18 -0400 +Subject: [PATCH] tmpfiles: Disable cleaning of /tmp and /var/tmp + +Bug: https://bugs.gentoo.org/490676 +--- + tmpfiles.d/tmp.conf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf +index 6bbd1aa..a361062 100644 +--- a/tmpfiles.d/tmp.conf ++++ b/tmpfiles.d/tmp.conf +@@ -8,8 +8,8 @@ + # See tmpfiles.d(5) for details + + # Clear tmp directories separately, to make them easier to override +-q /tmp 1777 root root 10d +-q /var/tmp 1777 root root 30d ++q /tmp 1777 root root ++q /var/tmp 1777 root root + + # Exclude namespace mountpoints created with PrivateTmp=yes + x /tmp/systemd-private-%b-* +-- +2.4.10 + diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index 72c65e0..c196654 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -145,7 +145,7 @@ src_prepare() { # Bug 463376 sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die epatch "${FILESDIR}/218-Dont-enable-audit-by-default.patch" - epatch "${FILESDIR}/226-noclean-tmp.patch" + epatch "${FILESDIR}/228-noclean-tmp.patch" epatch_user eautoreconf }