From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 3CA0D139694 for ; Fri, 10 Feb 2017 01:49:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 351A321C06C; Fri, 10 Feb 2017 01:49:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1322521C06C for ; Fri, 10 Feb 2017 01:49:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3B2AE340FC1 for ; Fri, 10 Feb 2017 01:49:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CB47F3F09 for ; Fri, 10 Feb 2017 01:49:07 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1486691324.7e61da823863ce1e9b55facc356b043d073f1349.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-process/audit/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-process/audit/audit-2.6.4.ebuild X-VCS-Directories: sys-process/audit/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 7e61da823863ce1e9b55facc356b043d073f1349 X-VCS-Branch: master Date: Fri, 10 Feb 2017 01:49:07 +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: a49f7795-dd8e-4e26-b387-49a6e5d45380 X-Archives-Hash: d202418a4bac0e272b9c327b70809059 commit: 7e61da823863ce1e9b55facc356b043d073f1349 Author: Mike Frysinger gentoo org> AuthorDate: Fri Feb 10 01:02:46 2017 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Fri Feb 10 01:48:44 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e61da82 sys-process/audit: use prefix vars for base paths sys-process/audit/audit-2.6.4.ebuild | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys-process/audit/audit-2.6.4.ebuild b/sys-process/audit/audit-2.6.4.ebuild index 34c881cdfd..0f4ddd8ceb 100644 --- a/sys-process/audit/audit-2.6.4.ebuild +++ b/sys-process/audit/audit-2.6.4.ebuild @@ -76,7 +76,7 @@ src_prepare() { multilib_src_configure() { local ECONF_SOURCE=${S} econf \ - --sbindir=/sbin \ + --sbindir="${EPREFIX}/sbin" \ --enable-systemd \ --without-python \ --without-python3 @@ -192,9 +192,9 @@ multilib_src_install_all() { fperms 644 "$(systemd_get_systemunitdir)"/auditd.service # 556436 - [ -f "${D}"/sbin/audisp-remote ] && \ + [ -f "${ED}"/sbin/audisp-remote ] && \ dodir /usr/sbin && \ - mv "${D}"/{sbin,usr/sbin}/audisp-remote || die + mv "${ED}"/{sbin,usr/sbin}/audisp-remote || die # Gentoo rules insinto /etc/audit/ @@ -205,7 +205,7 @@ multilib_src_install_all() { keepdir /var/log/audit/ # Security - lockdown_perms "${D}" + lockdown_perms "${ED}" prune_libtool_files --modules } @@ -216,15 +216,15 @@ pkg_preinst() { } pkg_postinst() { - lockdown_perms "${ROOT}" + lockdown_perms "${EROOT}" # Preserve from the audit-1 series preserve_old_lib_notify /$(get_libdir)/libaudit.so.0 } lockdown_perms() { - # upstream wants these to have restrictive perms - # should not || die, maybe not all paths exist - basedir="$1" + # Upstream wants these to have restrictive perms. + # Should not || die as not all paths may exist. + local basedir="$1" chmod 0750 "${basedir}"/sbin/au{ditctl,report,dispd,ditd,search,trace} 2>/dev/null chmod 0750 "${basedir}"/var/log/audit/ 2>/dev/null chmod 0640 "${basedir}"/etc/{audit/,}{auditd.conf,audit.rules*} 2>/dev/null