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 C7093138334 for ; Wed, 19 Dec 2018 14:58:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1762E09F0; Wed, 19 Dec 2018 14:58:21 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 A5728E09F0 for ; Wed, 19 Dec 2018 14:58:21 +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 D11AA335C07 for ; Wed, 19 Dec 2018 14:58:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9160B42F for ; Wed, 19 Dec 2018 14:58:17 +0000 (UTC) From: "José María Alonso" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "José María Alonso" Message-ID: <1545231490.ffd0f2d8b97e22102fe9c108c62b09f0fa7a4b3d.nimiux@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/mktwpol/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/mktwpol/mktwpol-1.0.1.ebuild X-VCS-Directories: app-admin/mktwpol/ X-VCS-Committer: nimiux X-VCS-Committer-Name: José María Alonso X-VCS-Revision: ffd0f2d8b97e22102fe9c108c62b09f0fa7a4b3d X-VCS-Branch: master Date: Wed, 19 Dec 2018 14:58:17 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 315b8287-3501-4f30-843d-f29fb43d9cca X-Archives-Hash: 1b0805b3c1c2913baa5561b2da43550c commit: ffd0f2d8b97e22102fe9c108c62b09f0fa7a4b3d Author: Chuck Seyboldt gmail com> AuthorDate: Wed Dec 19 14:57:01 2018 +0000 Commit: José María Alonso gentoo org> CommitDate: Wed Dec 19 14:58:10 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffd0f2d8 app-admin/mktwpol: Be more verbose Signed-off-by: José María Alonso gentoo.org> Package-Manager: Portage-2.3.40, Repoman-2.3.11 app-admin/mktwpol/mktwpol-1.0.1.ebuild | 70 +++++++++++++++++++++++----------- 1 file changed, 48 insertions(+), 22 deletions(-) diff --git a/app-admin/mktwpol/mktwpol-1.0.1.ebuild b/app-admin/mktwpol/mktwpol-1.0.1.ebuild index 9df4149288a..b494367e73b 100644 --- a/app-admin/mktwpol/mktwpol-1.0.1.ebuild +++ b/app-admin/mktwpol/mktwpol-1.0.1.ebuild @@ -5,7 +5,7 @@ EAPI=6 DESCRIPTION="Bash scripts to install tripwire and generate tripwire policy files" HOMEPAGE="https://sourceforge.net/projects/mktwpol" -SRC_URI="mirror://sourceforge/mktwpol/${P}.tar.gz" +SRC_URI="mirror://sourceforge/mktwpol/${PF}.tar.gz" LICENSE="CC-BY-SA-3.0" SLOT="0" @@ -14,29 +14,55 @@ IUSE="" RDEPEND="app-admin/tripwire" +S=${WORKDIR}/${PF} + src_prepare() { default - sed -i -e 's|/usr/local|/usr|' Makefile || die + sed -i -e 's:/usr/local:/usr:' Makefile || die } -pkg_postinst() { - elog - elog "Installation and setup of tripwire ..." - elog " - Run: \`twsetup.sh\`" - elog - elog "Maintenance of tripwire as packages are added and/or deleted ..." - elog " - Run: \`mktwpol.sh -u\` to update tripwire policy and database" - elog - elog "Mktwpol is packaged with multiple policy-rules-generating files." - elog "The default \"rules file\" is installed in /etc/tripwire" - elog "Alternatives are installed in /usr/share/doc/${P}" - elog "To use an alternative \"rules file\" ..." - elog "copy it to /etc/tripwire, uncompress it, and \`touch\` it ..." - elog - elog "\`cp /usr/share/doc/${P}/mktwpol*.rules.bz2 /etc/tripwire\`" - elog "\`bunzip2 /etc/tripwire/mktwpol*.rules.bz2\`" - elog - elog "mktwpol.sh uses the rules file with the most recent date." - elog "Use \`touch\` to choose between multiple rules files." - elog +pkg_preinst() { + # one elog message for new/first installation + # different elog message when updating + if [[ -z ${REPLACING_VERSIONS} ]] ; then + elog + elog "To facilitate a new installation and setup of tripwire:" + elog " - Run: \`twsetup.sh\`" + elog + elog "To update tripwire database as packages are added or deleted:" + elog " - Run: \`mktwpol.sh -u\`" + elog + elog "Mktwpol is packaged with multiple policy-generating rules files." + elog "A default \"rules file\" is installed in /etc/tripwire" + elog "Alternatives are available in /usr/share/doc/${PF}" + elog + elog "mktwpol.sh uses the policy-generating rules file with the" + elog "most recent date. To use an alternative \"rules file\"," + elog "copy it from /usr/share/doc/${PF} to /etc/tripwire," + elog " uncompress it, and \`touch\` it." + elog + elog "Read /usr/share/doc/${PF}/README for more tips." + elog + else + elog + elog "Version bump: mktwpol policy-generating rules have changed." + elog "Run \`mktwpol.sh -u\` to update tripwire policy and database." + elog + elog "Alternative policy-generating rules are in /usr/share/doc/${PF}" + elog "To use an alternative policy-generating rules file," + elog "copy it to /etc/tripwire, uncompress and \`touch\` it." + elog + fi + # ewarn message if a version change from 0.x.x + if [[ "${REPLACING_VERSIONS:0:1}" == "0" ]] ; then + ewarn + ewarn "Mktwpol default policy-generating rules no longer sort by package." + ewarn + ewarn " This change does not reduce the scope of system inspection!" + ewarn " It only affects the tripwire report format." + ewarn + ewarn " The previous default reporting format is still available, at" + ewarn " /usr/share/doc/${PF}/mktwpol-gentoo-packages.rules*" + ewarn + fi }