From aeb34c47a1042b074096bacb85205617c8a14d3a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 25 Jul 2022 02:55:08 +0100 Subject: gentoo auto-resync : 25:07:2022 - 02:55:08 --- sys-apps/Manifest.gz | Bin 48133 -> 48133 bytes sys-apps/file/Manifest | 2 +- sys-apps/file/metadata.xml | 17 +++--- sys-apps/logwatch/Manifest | 4 +- sys-apps/logwatch/logwatch-7.7.ebuild | 93 +++++++++++++++++++++++++++++++++ sys-apps/logwatch/logwatch-9999.ebuild | 20 +++---- 6 files changed, 116 insertions(+), 20 deletions(-) create mode 100644 sys-apps/logwatch/logwatch-7.7.ebuild (limited to 'sys-apps') diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz index f7676310fe09..0e8c9a049ccb 100644 Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest index 61bd4e10f259..4538665f135a 100644 --- a/sys-apps/file/Manifest +++ b/sys-apps/file/Manifest @@ -6,4 +6,4 @@ DIST file-5.42.tar.gz.asc 195 BLAKE2B 9b930bcd6b98878e60cd72d8d71b40201ebbf3ab1d EBUILD file-5.41.ebuild 3347 BLAKE2B 413305c675ac4b0af437e2ca48d4edd3ca29bbd3cfac376ebaed000142eb5a191f7d1c85449838ae204ec6c294828af68cfd7e6fe885b82c255d0570bc16b18d SHA512 396ef33817680b5bd48d7239e455f3c798f8813267ab7ea19dae7f845ad039164b88c6600887aba4254916a4ec857baaf01b949c6276510490e089d1f5b52f9b EBUILD file-5.42.ebuild 3705 BLAKE2B a29d50423ae325a4c4a6fba10c031e05874fa4d8aca399c7d81353603d98806c0db603c448b9caa7f436074d946f23be4e9d9b646064582c12dca87548faeacd SHA512 9403fb909a504b21d66eb738f82efe2a6733f1b083179a2bdd9673b0c99208b2838f5122e1c4ed075f2f41e172f101e6a69eead6e4a038eaae5a5a5e44c07cd0 EBUILD file-9999.ebuild 3630 BLAKE2B 7eaf1c27c8b192957a7f3ba08f6e0ba3f45e52689fdd87e98a9d2d9e955b1f43fdf2410dd48a3c8c858f0c6eb467d6c987b02fd432ec25d6be16fa6e71c89880 SHA512 28655fdb206cc8d60778f63da73cfed704c9e4c3304c76885448eac56bd9549c950a0d70102b341459834694bae87e5cdd9d9159d29f308da0f6b33690513bca -MISC metadata.xml 382 BLAKE2B 204b7440b6a18907045d7eae05e8c99d017fa57b5178462125b998d8b3af3e2be656353f5c69823f3b5ea4d86e7e6c028229af27abaf2f7ace6f181f9ebf4153 SHA512 0e56117ac1957f2393ab47dc875e5f07851f3866014388418f84668f5f9767f6ca83963547442606e1c637ed3bcbb81b317cf994de4a04cd28725d8f6cb49b5e +MISC metadata.xml 439 BLAKE2B d937d412b733516f49ca24a5de5238688ba56c06872cec060608139cb551f78e165e05990bcf6ea5bb1e98d27eb2650f5a972a4cded85eb67dbe9218d5d705b8 SHA512 20ff0c1b94dae95c3b277cfcc10da2b6ff31582cfe8f4e2ae60a74ec45db2a854eef40950f354465a45563ee6333f327566565e40cb16249d191bde585c5b1f2 diff --git a/sys-apps/file/metadata.xml b/sys-apps/file/metadata.xml index 034e87228c1c..9d92ca28bc24 100644 --- a/sys-apps/file/metadata.xml +++ b/sys-apps/file/metadata.xml @@ -1,12 +1,13 @@ - - base-system@gentoo.org - Gentoo Base System - - - https://bugs.astron.com/ - cpe:/a:file_project:file - + + base-system@gentoo.org + Gentoo Base System + + + https://bugs.astron.com/ + cpe:/a:file_project:file + file/file + diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest index e28bf2c97b23..39df82b553dc 100644 --- a/sys-apps/logwatch/Manifest +++ b/sys-apps/logwatch/Manifest @@ -1,6 +1,8 @@ AUX logwatch 125 BLAKE2B 93e0bb2e65dda3a81e1bf560c06a3739fc2226488492219fab478326e8a05051077cfd6ee604d3ebd7aaa2329687a0f3facdb2741e99bf9ea4207a939a16f885 SHA512 20cdf61fe9e9bfe336c6b7e1f33c982c34e61370431179a2f766da8e1b56f8452c85d75fbba4f459f9c4761a7a932c309d0ba7253aeb6e3b31b220c00106e504 AUX logwatch.tmpfile 39 BLAKE2B 9b1df0ad28bdc16373e71eedb05e8962bf4eda5d564ba8e2632af8158fa3346e8784db2a6bf9aa90c04768743aee6eaefae517feb9f7066d748cae894c1a2299 SHA512 7902aab160b5fd6e1bb1573777f9fab065ed33b0df19da2b5dad31ca962eaea93f9d46e57efca2d76df26c55b48e0578fddf4136e36ed565d8a2b5258dc34afd DIST logwatch-7.6.tar.gz 488750 BLAKE2B fd7f2a7c65151dbfbd924102b01ead00f92d74a59a417361b65be972368f7ed93810feefedf1ad9bba2de5ebbc74589c3fc0a8a484f19b5a9782c9799ffdf656 SHA512 8672dcf2b781d89ec281c4370b204467f9db219edb7c23adf02b71decf0ecab7b442d6e95e91416af3aecc27948e9442bb3b369e532e40f7ef32635628e110af +DIST logwatch-7.7.tar.gz 498214 BLAKE2B 8978930fe844bde372f68038f295cc62ca61f1c2b10d18f545ddcc713cb72cd01520ff0ea0869f2dff96846431a6dd9a04da1bc79817ccb590b0235f96e934da SHA512 5224013c548e60248ef2de8aeabc760d046374f54035e7e5e00bba0c6e6777eb5e7fcfd05a9f029d3d34e9d3fb8a243ed99b417961b21895cc14b881f1ad3dd4 EBUILD logwatch-7.6.ebuild 2412 BLAKE2B cbcd0212a9615556f4fd1d88dad7020bd8dd9d389efbd0cb11c8aa59c5d23e0d05ecfab4fb5fcfc750e78914c0ce6f15f68225d0921163e1edb56b5cf55c07a5 SHA512 a1a7f7e4bc55099b8aaeeef0250496850a5a3c82ae6855795668a91e2e0f2a35c0c94b9fbc431c74ff3c57d67a89645ebb04d29421214c0aeec4a6f8b8dd39a3 -EBUILD logwatch-9999.ebuild 2420 BLAKE2B 5876966303c0c8c809b49a14278f2196747b21c32bdfd7aee74418ec8309b3a2eb6f7fe28c89cd1cffaafb7b371d4837b5ee32fdd44226d98b3a9bd3b1e0ff1a SHA512 7bb4bc9a0e4e463185f7080fd8144d0f42f036fc354f55aaf25025ef722e6ad5921c942bface3571465b308bf7ed892c8623224bc991651c4144833d63cbdc4e +EBUILD logwatch-7.7.ebuild 2413 BLAKE2B f846a4b0f713e757baaacc811b97ad37456b58b255ab616b8debbaafbc9ed754a214f71fc1f8da0c86aff2df3b70b199e0f28322a359a2514028e4782fd31ee3 SHA512 a59f67d27700d7fc8e6910e846bbb975dacd92098f5f3752ac8c6c7e7968a0fe40dce3267f69c7e853b0e3bcbedf92105f2faf137ec6308c302a261821c4d38e +EBUILD logwatch-9999.ebuild 2413 BLAKE2B f846a4b0f713e757baaacc811b97ad37456b58b255ab616b8debbaafbc9ed754a214f71fc1f8da0c86aff2df3b70b199e0f28322a359a2514028e4782fd31ee3 SHA512 a59f67d27700d7fc8e6910e846bbb975dacd92098f5f3752ac8c6c7e7968a0fe40dce3267f69c7e853b0e3bcbedf92105f2faf137ec6308c302a261821c4d38e MISC metadata.xml 329 BLAKE2B ae6bfb6282dd2f5ddc01959eb57e894cc12a69de5fea771439d9b2a95110754fd7c35db97ee238865cfb81333800dcdcfb42654d12572e16cde12c7212a505c5 SHA512 a523f269535d7e0272f2d66b903319197f52477dbf40b32729eff93b5788f9c8b8756a4750128f894b4ab0d05b9effbac5d350e5ae2ab68474ef4fa39022710a diff --git a/sys-apps/logwatch/logwatch-7.7.ebuild b/sys-apps/logwatch/logwatch-7.7.ebuild new file mode 100644 index 000000000000..db6cdabae32a --- /dev/null +++ b/sys-apps/logwatch/logwatch-7.7.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit tmpfiles + +if [[ ${PV} == 9999 ]] ; then + EGIT_REPO_URI="https://git.code.sf.net/p/logwatch/git ${PN}" + inherit git-r3 +else + SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +fi + +DESCRIPTION="Analyzes and Reports on system logs" +HOMEPAGE="https://sourceforge.net/projects/logwatch/" + +LICENSE="MIT" +SLOT="0" + +RDEPEND=" + dev-lang/perl + dev-perl/Date-Calc + dev-perl/Date-Manip + dev-perl/Tie-IxHash + dev-perl/Sys-CPU + dev-perl/Sys-MemInfo + virtual/cron + virtual/mta + virtual/mailx +" + +src_install() { + dodir /usr/share/logwatch/lib + dodir /usr/share/logwatch/scripts/services + dodir /usr/share/logwatch/scripts/shared + dodir /usr/share/logwatch/default.conf/logfiles + dodir /usr/share/logwatch/default.conf/services + dodir /usr/share/logwatch/default.conf/html + keepdir /etc/logwatch + + # logwatch.pl requires cache dir (bug #607668) + newtmpfiles "${FILESDIR}"/logwatch.tmpfile ${PN}.conf + + newsbin scripts/logwatch.pl logwatch.pl + + exeinto /usr/share/logwatch/lib + doexe lib/*.pm + + exeinto /usr/share/logwatch/scripts/services + doexe scripts/services/* + + exeinto /usr/share/logwatch/scripts/shared + doexe scripts/shared/* + + insinto /usr/share/logwatch/default.conf + doins conf/logwatch.conf + + insinto /usr/share/logwatch/default.conf/logfiles + doins conf/logfiles/* + + insinto /usr/share/logwatch/default.conf/services + doins conf/services/* + + insinto /usr/share/logwatch/default.conf/html + doins conf/html/* + + # Make sure logwatch is run before anything else (bug #100243) + exeinto /etc/cron.daily + newexe "${FILESDIR}"/logwatch 00-logwatch + + doman logwatch.8 + dodoc README HOWTO-Customize-LogWatch + + # Do last due to insopts modification. + insinto /usr/share/logwatch/scripts/logfiles + insopts -m755 + doins -r scripts/logfiles/* +} + +pkg_postinst() { + # Migration from /etc/cron.daily/logwatch -> /etc/cron.daily/00-logwatch (bug #100243) + if [[ -e ${ROOT}/etc/cron.daily/logwatch ]] ; then + local md5=$(md5sum "${ROOT}"/etc/cron.daily/logwatch) + [[ ${md5} == "edb003cbc0686ed4cf37db16025635f3" ]] \ + && rm -f "${ROOT}"/etc/cron.daily/logwatch \ + || ewarn "You have two logwatch files in /etc/cron.daily/" + fi + + # Trigger cache dir creation to allow immediate use of logwatch (bug #607668) + tmpfiles_process ${PN}.conf +} diff --git a/sys-apps/logwatch/logwatch-9999.ebuild b/sys-apps/logwatch/logwatch-9999.ebuild index 13d30026df24..db6cdabae32a 100644 --- a/sys-apps/logwatch/logwatch-9999.ebuild +++ b/sys-apps/logwatch/logwatch-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +EAPI=8 inherit tmpfiles -if [[ ${PV} == "9999" ]] ; then +if [[ ${PV} == 9999 ]] ; then EGIT_REPO_URI="https://git.code.sf.net/p/logwatch/git ${PN}" inherit git-r3 else @@ -19,17 +19,17 @@ HOMEPAGE="https://sourceforge.net/projects/logwatch/" LICENSE="MIT" SLOT="0" -RDEPEND="virtual/cron - virtual/mta - virtual/mailx +RDEPEND=" dev-lang/perl dev-perl/Date-Calc dev-perl/Date-Manip dev-perl/Tie-IxHash dev-perl/Sys-CPU - dev-perl/Sys-MemInfo" - -PATCHES=() + dev-perl/Sys-MemInfo + virtual/cron + virtual/mta + virtual/mailx +" src_install() { dodir /usr/share/logwatch/lib @@ -66,7 +66,7 @@ src_install() { insinto /usr/share/logwatch/default.conf/html doins conf/html/* - # Make sure logwatch is run before anything else #100243 + # Make sure logwatch is run before anything else (bug #100243) exeinto /etc/cron.daily newexe "${FILESDIR}"/logwatch 00-logwatch -- cgit v1.2.3