commit: 130fd3900a6254296acd6f14f8d7129992418ae5 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Sat Nov 4 18:19:22 2017 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Sat Nov 4 18:21:43 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=130fd390
sys-apps/logwatch: Bump to v7.4.3_p20171025 (snapshot release) - We are now creating /var/cache/logwatch via tmpfile (bug #607668) - Snapshot release should address missed dovecot log entires (bug #633916) Closes: https://bugs.gentoo.org/607668 Closes: https://bugs.gentoo.org/633916 Package-Manager: Portage-2.3.13, Repoman-2.3.4 sys-apps/logwatch/Manifest | 1 + .../files/logwatch-7.4.3+-openssh-hpn.patch | 16 +++ sys-apps/logwatch/files/logwatch.tmpfile | 1 + sys-apps/logwatch/logwatch-7.4.3_p20171025.ebuild | 108 +++++++++++++++++++++ 4 files changed, 126 insertions(+) diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest index 2925647b769..a34ef6ebd1f 100644 --- a/sys-apps/logwatch/Manifest +++ b/sys-apps/logwatch/Manifest @@ -1 +1,2 @@ DIST logwatch-7.4.3.tar.gz 462552 SHA256 1dbdc48d65e150f2dbb43f1e4f4700d94166e053b1c7bbbdedf4ad670283720e SHA512 716d87238f487010f2bdf230fc66c16f3c3fe769e6bef04b0e7881c6b0563e1a4b4741235b8a40a16ab21d3803562e87e6bcf5cfbd0ace42414f1d1feae7a13a WHIRLPOOL abe7870020029f86f037f4c96dff96b6c542eb36df9f110c755d6de28965c6418dd4d03a2e6932ff8db7079f22ea396d352aa6b8ebba81576b588017b4694d02 +DIST logwatch-7.4.3_p20171025.zip 704529 SHA256 8e93ffb0ecbccb30d35ad01ba838879456e98b7b74bc274f90bab1b63ec37568 SHA512 aeaf57aa8d4e89b716766bf89a6b58dcb18f1ba6de864b913d93474f784f382e322b6dbfdf9671c8b91404d399d770146ead9959b1202e91b4672e70f6abb268 WHIRLPOOL e40e65acf1bbc0c6c5ec0dfe43ca396b19d001900eb0e11bf7df95d4cc8359a82c9630761fd1745a91be0da40452999fc17baaa5cf1343a4cde036121696589a diff --git a/sys-apps/logwatch/files/logwatch-7.4.3+-openssh-hpn.patch b/sys-apps/logwatch/files/logwatch-7.4.3+-openssh-hpn.patch new file mode 100644 index 00000000000..426253df85d --- /dev/null +++ b/sys-apps/logwatch/files/logwatch-7.4.3+-openssh-hpn.patch @@ -0,0 +1,16 @@ +Add an 'ignore' line for the HPN patch that we enable on our openssh by default. + +https://sourceforge.net/tracker/?func=detail&aid=3257504&group_id=312875&atid=1316824 + +--- a/scripts/services/sshd ++++ b/scripts/services/sshd +@@ -315,7 +315,8 @@ while (defined(my $ThisLine = <STDIN>)) { + ($ThisLine =~ /Found matching \w+ key:/ ) or + ($ThisLine =~ /User child is on pid \d/ ) or + ($ThisLine =~ /Nasty PTR record .* is set up for [\da-fA-F.:]+, ignoring/) or +- ($ThisLine =~ /Disconnected from [\da-fA-F.:]* port \d*/ ) ++ ($ThisLine =~ /Disconnected from [\da-fA-F.:]* port \d*/ ) or ++ ($ThisLine =~ /^SSH: Server;L[Tt]ype: /) + ) { + # Ignore these + } elsif ( my ($Method,$User,$Host,$Port,$Key,$FingerP) = ($ThisLine =~ /^Accepted (\S+) for ((?:invalid user )?\S+) from ([\d\.:a-f]+)(?:%\w+)? port (\d+) ssh[12](?:: (\w+) (.+))?/) ) { diff --git a/sys-apps/logwatch/files/logwatch.tmpfile b/sys-apps/logwatch/files/logwatch.tmpfile new file mode 100644 index 00000000000..86bd4cc7b3b --- /dev/null +++ b/sys-apps/logwatch/files/logwatch.tmpfile @@ -0,0 +1 @@ +d /var/cache/logwatch 0770 root root - diff --git a/sys-apps/logwatch/logwatch-7.4.3_p20171025.ebuild b/sys-apps/logwatch/logwatch-7.4.3_p20171025.ebuild new file mode 100644 index 00000000000..2cb75e82997 --- /dev/null +++ b/sys-apps/logwatch/logwatch-7.4.3_p20171025.ebuild @@ -0,0 +1,108 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit tmpfiles + +MY_COMMIT="d36589f22a322a5ec4d77618b408803f4d193c2e" + +PATCHES=( "${FILESDIR}"/${PN}-7.4.3+-openssh-hpn.patch ) + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://git.code.sf.net/p/logwatch/git ${PN}" + inherit git-r3 +else + SRC_URI="https://sourceforge.net/code-snapshots/git/l/lo/logwatch/git.git/logwatch-git-${MY_COMMIT}.zip -> ${P}.zip" + KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +fi + +DESCRIPTION="Analyzes and Reports on system logs" +HOMEPAGE="http://www.logwatch.org/"; + +LICENSE="MIT" +SLOT="0" +IUSE="" + +DEPEND="app-arch/unzip" +RDEPEND="virtual/cron + virtual/mta + virtual/mailx + dev-lang/perl + dev-perl/Date-Calc + dev-perl/Date-Manip + dev-perl/Tie-IxHash + dev-perl/Sys-CPU + dev-perl/Sys-MemInfo" + +S="${WORKDIR}/${PN}-git-${MY_COMMIT}" + +src_prepare() { + default + + sed \ + -e "s:my \$Version = '7.4.3';:my \$Version = '${PV}';:" \ + -e "s:my \$VDate = '04/27/16';:my \$VDate = '10/25/17';:" \ + -i scripts/logwatch.pl || die +} + +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 #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 +}
