diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-02-02 01:39:05 +0000 |
| commit | fcc5224904648a8e6eb528d7603154160a20022f (patch) | |
| tree | 3bfce096b38a9cea8eed13fc70c1526c456e9abd /app-forensics/lynis | |
| parent | 2fd57282f0262ca084e05b0f2c63fbada395d02b (diff) | |
gentoo resync : 02.02.2022
Diffstat (limited to 'app-forensics/lynis')
| -rw-r--r-- | app-forensics/lynis/Manifest | 6 | ||||
| -rw-r--r-- | app-forensics/lynis/lynis-3.0.7-r1.ebuild (renamed from app-forensics/lynis/lynis-3.0.6.ebuild) | 31 | ||||
| -rw-r--r-- | app-forensics/lynis/metadata.xml | 3 |
3 files changed, 31 insertions, 9 deletions
diff --git a/app-forensics/lynis/Manifest b/app-forensics/lynis/Manifest index 9a9b10ce0863..d41857411d4d 100644 --- a/app-forensics/lynis/Manifest +++ b/app-forensics/lynis/Manifest @@ -1,4 +1,4 @@ AUX lynis.cron-new 72 BLAKE2B 1f2d683c74e9e85f142c23277f24e8c81b33e4d1691a6f171694194bd5d81a5e1473532afe2c6fca23c995d9c7bd08d18d6eed78a07661618c12e22b35e9ff81 SHA512 1cdaaee433912c2ccdec8ad7c9b88be55fe3f1d68e2fca79cc6e0e10112d465a70cfbe0a049623437f604bfc9793e0d29b709e035cbf710d4d38ba48acc5355f -DIST lynis-3.0.6.tar.gz 336725 BLAKE2B 49abad8af63e4eeb3585a241d34433f85f84719a0bbd0c2c1f87a2ab45fc0f88193236f3b10261a59e1c6efd9352134a29b8f311c5a5a749eccede2c8353c6e7 SHA512 113f3bf1b8ca4ec030bd971da41e3f182c2467d97e09eb0f2b502ab5d04c43b922570a00b62de06b97bfca64cb67576f14754f9921be63731500d3beb33d5a2a -EBUILD lynis-3.0.6.ebuild 1157 BLAKE2B 4325283944043df8436d178c0a492df13ac37f25d3bebb57e1829da12483a9b29f31ea957f799ef6f45e3fe593feea87714c0fe7eab8d75b4f9b45e956760b93 SHA512 8b044e319f313239101100a5b11c1d1cec81d097f265123cb72163f94ce97f59a8b7fe97ef027b65bef64abc032aca2186e466f96313c0becdd82a84d2db14b6 -MISC metadata.xml 252 BLAKE2B 8f1004ecee8a05309563a95ad3cedf667680511094e6e9ef6a22d245a8a884d8be18142cdd6986c5561e5663c3ebd716021dccb5c98956b1e0a17380ab130545 SHA512 613b2b774b48d3e95b6792f7e9f9308683eddc02cd88d87da13141ef46e822bb59bd9d5b06fdd1f52b709574319314b138461efd06b00bc0144805824d3e2db3 +DIST lynis-3.0.7.tar.gz 338212 BLAKE2B d9cddcba9c83ddee08ea38c8e80bf6f0a78179ad102673a876a1fe3d4544612e945d8637a8d026ce7bff72b09d6274223031e1cb6fc74596b2c65f0380fecd67 SHA512 c65d42071a48b15c2f16ceaf30404db0dac740c4cc6109442a0757e0576f794ebaf9430547eb1a0a452ce85993f00e8779ce2c4ffc47c206d674b8fd2cb02e3a +EBUILD lynis-3.0.7-r1.ebuild 1797 BLAKE2B d52a6e8ffe953af973b32d54fa0f5d28920f8f431b51f5fdb917292c4eef781bcc04a3a6e0b176e8771adea3b048346d94f50428de70469fc2067d26b73980c7 SHA512 1cbb68236f68d559d29cd4c78307d55aa798fedd38c87e62f12c39e147066e9aa84d8560e8904653d25da9ab6feca968b8e5f0def845f884ffd405089e1c8b6f +MISC metadata.xml 324 BLAKE2B 3ccc9fa29e93b80f279e24768171e1ed3ae9c371ec0cc1fca13770f498c91a75235e886b1c873dbf2a6a7355caa054c614612054251f3cdd828813e93948b6be SHA512 349bad0292a35a2434456d7b9385163a41e2430651f3fe115a3953ae8419d4369b339691b84502ff661267c8948fac13eeffe9dec2cb0a92bdf3d478cb48b0a5 diff --git a/app-forensics/lynis/lynis-3.0.6.ebuild b/app-forensics/lynis/lynis-3.0.7-r1.ebuild index 0de67b2421e8..6209f7360914 100644 --- a/app-forensics/lynis/lynis-3.0.6.ebuild +++ b/app-forensics/lynis/lynis-3.0.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -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>mpagano@gentoo.org</email> <name>Mike Pagano</name> </maintainer> + <use> + <flag name="cron">Install /etc/cron.* files</flag> + </use> </pkgmetadata> |