[gentoo-commits] repo/gentoo:master commit in: app-admin/mktwpol/

["José María Alonso" <nimiux@gentoo.org>]

commit:     ffd0f2d8b97e22102fe9c108c62b09f0fa7a4b3d
Author:     Chuck Seyboldt <seyboldt <AT> gmail <DOT> com>
AuthorDate: Wed Dec 19 14:57:01 2018 +0000
Commit:     José María Alonso <nimiux <AT> gentoo <DOT> 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 <nimiux <AT> 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
 }