commit: c04553861ff206dfcc5b90e9104f15e8e434d6c1 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Sat Jun 8 12:54:51 2019 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Sat Jun 8 12:54:51 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0455386
sys-apps/logwatch: drop old Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> sys-apps/logwatch/Manifest | 2 - .../files/logwatch-7.4.2-openssh-hpn.patch | 16 --- .../files/logwatch-7.4.3+-openssh-hpn.patch | 16 --- sys-apps/logwatch/logwatch-7.4.3.ebuild | 84 ---------------- sys-apps/logwatch/logwatch-7.4.3_p20171025.ebuild | 108 --------------------- 5 files changed, 226 deletions(-) diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest index 2935d869fd0..aabad0546e0 100644 --- a/sys-apps/logwatch/Manifest +++ b/sys-apps/logwatch/Manifest @@ -1,3 +1 @@ -DIST logwatch-7.4.3.tar.gz 462552 BLAKE2B 98ecba949d9fa2737da6b22ff2cced14d384ff4f119a7a8e613a66869102ea76ce1093ef5f0b38e6d4e948a8e9e0dafe8b4071e028c5f5f5be2ee48e9b1f186b SHA512 716d87238f487010f2bdf230fc66c16f3c3fe769e6bef04b0e7881c6b0563e1a4b4741235b8a40a16ab21d3803562e87e6bcf5cfbd0ace42414f1d1feae7a13a -DIST logwatch-7.4.3_p20171025.zip 704529 BLAKE2B 12f4e34d9cd044f677b1b4cbe473c425e9b3ab2f222e781a0a3df95b9cbc088cf16321ccd67ec9acaa4c21b8da3deac4d58d84cba2259b272717337c5c87c3ff SHA512 aeaf57aa8d4e89b716766bf89a6b58dcb18f1ba6de864b913d93474f784f382e322b6dbfdf9671c8b91404d399d770146ead9959b1202e91b4672e70f6abb268 DIST logwatch-7.5.1.tar.gz 469715 BLAKE2B 706352c60370d13b4f72047d08965ab0dd36837194a03bf44e08ec43641eddb8d80d655c783d4f25c8fa757853a4e069997b80676b781561c5e0a23b44a393c9 SHA512 945e66192a9e198169426497f7b5167fcbec2af9565dfead728aa91bfdac5f7e1b2ce2f5f404b6f03841fe6b978f70fb969b47d4f60f02f9a8ccea865c5c782c diff --git a/sys-apps/logwatch/files/logwatch-7.4.2-openssh-hpn.patch b/sys-apps/logwatch/files/logwatch-7.4.2-openssh-hpn.patch deleted file mode 100644 index 80e6ee06b76..00000000000 --- a/sys-apps/logwatch/files/logwatch-7.4.2-openssh-hpn.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 - ---- logwatch-7.4.2/scripts/services/sshd -+++ logwatch-7.4.2/scripts/services/sshd -@@ -297,7 +297,8 @@ - ($ThisLine =~ /Starting session: (forced-command|subsystem|shell|command)/ ) or - ($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/) -+ ($ThisLine =~ /Nasty PTR record .* is set up for [\da-fA-F.:]+, ignoring/) or -+ ($ThisLine =~ /^SSH: Server;L[Tt]ype: /) - ) { - # Ignore these - } elsif ( my ($Method,$User,$Host,$Port,$Key) = ($ThisLine =~ /^Accepted (\S+) for ((?:invalid user )?\S+) from ([\d\.:a-f]+) port (\d+) ssh[12](?:: (\w+))?/) ) { 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 deleted file mode 100644 index 426253df85d..00000000000 --- a/sys-apps/logwatch/files/logwatch-7.4.3+-openssh-hpn.patch +++ /dev/null @@ -1,16 +0,0 @@ -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/logwatch-7.4.3.ebuild b/sys-apps/logwatch/logwatch-7.4.3.ebuild deleted file mode 100644 index 1f058e2a889..00000000000 --- a/sys-apps/logwatch/logwatch-7.4.3.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils - -DESCRIPTION="Analyzes and Reports on system logs" -HOMEPAGE="http://www.logwatch.org/"; -SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="" - -DEPEND="" -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" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-7.4.2-openssh-hpn.patch -} - -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 - - 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() { - 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 -} diff --git a/sys-apps/logwatch/logwatch-7.4.3_p20171025.ebuild b/sys-apps/logwatch/logwatch-7.4.3_p20171025.ebuild deleted file mode 100644 index 391f0f2e953..00000000000 --- a/sys-apps/logwatch/logwatch-7.4.3_p20171025.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# 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 ~arm64 ~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 -}
