From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1085387-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 28806138334
	for <garchives@archives.gentoo.org>; Wed, 24 Apr 2019 12:39:30 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 5C784E092A;
	Wed, 24 Apr 2019 12:39:29 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 46606E092A
	for <gentoo-commits@lists.gentoo.org>; Wed, 24 Apr 2019 12:39:29 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 276623423B7
	for <gentoo-commits@lists.gentoo.org>; Wed, 24 Apr 2019 12:39:28 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 84BEA58A
	for <gentoo-commits@lists.gentoo.org>; Wed, 24 Apr 2019 12:39:26 +0000 (UTC)
From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" <polynomial-c@gentoo.org>
Message-ID: <1556109559.d3d0b840746804723df05de43d65403bce3b64c7.polynomial-c@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/uptimed/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-misc/uptimed/uptimed-0.4.0-r1.ebuild app-misc/uptimed/uptimed-0.4.1-r1.ebuild
X-VCS-Directories: app-misc/uptimed/
X-VCS-Committer: polynomial-c
X-VCS-Committer-Name: Lars Wendler
X-VCS-Revision: d3d0b840746804723df05de43d65403bce3b64c7
X-VCS-Branch: master
Date: Wed, 24 Apr 2019 12:39:26 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 2a7c021b-c539-4c01-99ad-6998c4b12668
X-Archives-Hash: b882e5105a43cf480467fa2b9c33bc2f

commit:     d3d0b840746804723df05de43d65403bce3b64c7
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 24 12:39:05 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Apr 24 12:39:19 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3d0b840

app-misc/uptimed: And another attempt to fix privilege escalation

Closes: https://bugs.gentoo.org/630810
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 app-misc/uptimed/uptimed-0.4.0-r1.ebuild | 5 +++--
 app-misc/uptimed/uptimed-0.4.1-r1.ebuild | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app-misc/uptimed/uptimed-0.4.0-r1.ebuild b/app-misc/uptimed/uptimed-0.4.0-r1.ebuild
index ce315a00fa4..b57ecd03da9 100644
--- a/app-misc/uptimed/uptimed-0.4.0-r1.ebuild
+++ b/app-misc/uptimed/uptimed-0.4.0-r1.ebuild
@@ -49,8 +49,9 @@ pkg_postinst() {
 	local spooldir="/var/spool/${PN}"
 	if [[ -d "${spooldir}" ]] ; then
 		einfo "Fixing permissions in ${spooldir}"
-		find ${spooldir} -type f -links 1 -print0 \
-			| xargs --null chown uptimed:uptimed || die
+		find ${spooldir} -type f -links 1 \
+			\( -name records -o -name records.old \) \
+			| xargs chown uptimed:uptimed || die
 	fi
 	echo
 	elog "Start uptimed with '/etc/init.d/uptimed start' (for openRC)"

diff --git a/app-misc/uptimed/uptimed-0.4.1-r1.ebuild b/app-misc/uptimed/uptimed-0.4.1-r1.ebuild
index 02f2ea8899c..bd5bc67239e 100644
--- a/app-misc/uptimed/uptimed-0.4.1-r1.ebuild
+++ b/app-misc/uptimed/uptimed-0.4.1-r1.ebuild
@@ -47,8 +47,9 @@ pkg_postinst() {
 	local spooldir="/var/spool/${PN}"
 	if [[ -d "${spooldir}" ]] ; then
 		einfo "Fixing permissions in ${spooldir}"
-		find ${spooldir} -type f -links 1 -print0 \
-			| xargs --null chown uptimed:uptimed || die
+		find ${spooldir} -type f -links 1 \
+			\( -name records -o -name records.old \) \
+			| xargs chown uptimed:uptimed || die
 	fi
 	echo
 	elog "Start uptimed with '/etc/init.d/uptimed start' (for openRC)"