[gentoo-commits] repo/gentoo:master commit in: app-forensics/lynis/

[Mike Pagano]

commit:     15b16fa6fd962c7278131da9156657287c6880a7
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 20 23:51:49 2022 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Thu Jan 20 23:51:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15b16fa6

app-forensics/lynis: Do not install cron scripts when not appropiate

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 .../{lynis-3.0.7.ebuild => lynis-3.0.7-r1.ebuild}  | 29 ++++++++++++++++++----
 app-forensics/lynis/metadata.xml                   |  3 +++
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/app-forensics/lynis/lynis-3.0.7.ebuild 
b/app-forensics/lynis/lynis-3.0.7-r1.ebuild
similarity index 57%
rename from app-forensics/lynis/lynis-3.0.7.ebuild
rename to app-forensics/lynis/lynis-3.0.7-r1.ebuild
index 6ae259786a48..913dca9f8bb1 100644
--- a/app-forensics/lynis/lynis-3.0.7.ebuild
+++ b/app-forensics/lynis/lynis-3.0.7-r1.ebuild
@@ -12,10 +12,12 @@ SRC_URI="https://cisofy.com/files/${P}.tar.gz";
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="cron systemd"
 
 DEPEND=""
-RDEPEND="app-shells/bash"
+RDEPEND="
+       app-shells/bash
+       !systemd? ( virtual/cron )"
 
 S="${WORKDIR}/${PN}"
 
@@ -44,10 +46,27 @@ src_install() {
        sed -i -e 's/\/path\/to\///' "${S}/extras/systemd/${PN}.service" || die 
"Sed Failed!"
        systemd_dounit "${S}/extras/systemd/${PN}.service" || die "Sed Failed!"
        systemd_dounit "${S}/extras/systemd/${PN}.timer"
+
+       if ! use cron; then
+               ebegin "removing cron files from installation image"
+               rm -rfv "${ED}/etc/cron.daily" || die
+               eend "$?"
+       fi
 }
 
 pkg_postinst() {
-       einfo
-       einfo "A cron script has been installed to 
${ROOT}/etc/cron.daily/lynis."
-       einfo
+       if use cron; then
+               if systemd_is_booted || has_version sys-apps/systemd; then
+                       echo
+                       ewarn "Both 'cron' and 'systemd' flags are enabled."
+                       ewarn "So both ${PN}.target and cron files were 
installed."
+                       ewarn "Please don't use 2 implementations at the same 
time."
+                       ewarn "Cronjobs are usually enabled by default via 
/etc/cron.* jobs"
+                       ewarn "If you want to use systemd ${PN}.target timers"
+                       ewarn "disable 'cron' flag and reinstall ${PN}"
+                       echo
+               else
+                       einfo "A cron script has been installed to 
${ROOT}/etc/cron.daily/lynis."
+               fi
+       fi
 }

diff --git a/app-forensics/lynis/metadata.xml b/app-forensics/lynis/metadata.xml
index 086891921a07..72bf02bbb435 100644
--- a/app-forensics/lynis/metadata.xml
+++ b/app-forensics/lynis/metadata.xml
@@ -5,4 +5,7 @@
     <email>mpag...@gentoo.org</email>
     <name>Mike Pagano</name>
   </maintainer>
+  <use>
+    <flag name="cron">Install /etc/cron.* files</flag>
+  </use>
 </pkgmetadata>