From 6118d6de5092f48f2cae7a2d380e1caef78ab8e0 Mon Sep 17 00:00:00 2001 From: Paul Healy Date: Mon, 28 Oct 2019 14:19:39 +0000 Subject: [PATCH] app-admin/syslog-summary: fix adjacent line ignore fix for not ignoring a second line when two lines which should be ignored come together - backport fix from: https://github.com/dpaleino/syslog-summary/pull/1/files switch to EAPI 7 Signed-off-by: Paul Healy Closes: https://github.com/gentoo/gentoo/pull/13477 Signed-off-by: Joonas Niilola --- .../syslog-summary-1.14-fix-ignore-code.patch | 12 +++++ .../syslog-summary-1.14-r3.ebuild | 49 +++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 app-admin/syslog-summary/files/syslog-summary-1.14-fix-ignore-code.patch create mode 100644 app-admin/syslog-summary/syslog-summary-1.14-r3.ebuild diff --git a/app-admin/syslog-summary/files/syslog-summary-1.14-fix-ignore-code.patch b/app-admin/syslog-summary/files/syslog-summary-1.14-fix-ignore-code.patch new file mode 100644 index 000000000000..b66a0ad51ceb --- /dev/null +++ b/app-admin/syslog-summary/files/syslog-summary-1.14-fix-ignore-code.patch @@ -0,0 +1,12 @@ +diff --git a/syslog-summary b/syslog-summary +index abf6381..65608cb 100755 +--- a/syslog-summary ++++ b/syslog-summary +@@ -198,6 +198,7 @@ def summarize(filename, states): + if DEBUG: + print "Ignoring: %s" % line + line = file.readline() ++ continue + + date, rest = split_date(line) + if date: diff --git a/app-admin/syslog-summary/syslog-summary-1.14-r3.ebuild b/app-admin/syslog-summary/syslog-summary-1.14-r3.ebuild new file mode 100644 index 000000000000..75c1c04b2464 --- /dev/null +++ b/app-admin/syslog-summary/syslog-summary-1.14-r3.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python2_7 ) + +inherit python-single-r1 + +DESCRIPTION="Summarizes the contents of a syslog log file" +HOMEPAGE="https://github.com/dpaleino/syslog-summary" +SRC_URI="https://github.com/downloads/dpaleino/${PN}/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~sparc ~x86" +IUSE="" + +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +DEPEND="" +RDEPEND="${PYTHON_DEPS}" + +PATCHES=( "${FILESDIR}/${P}-fix-ignore-code.patch" ) + +src_prepare() { + python_fix_shebang -f syslog-summary + + sed -i -e 's:python-magic:sys-apps/file[python]:' "syslog-summary" || die + + # Sadly, the makefile is useless for us. + rm Makefile || die + + default +} + +src_install() { + dobin syslog-summary + einstalldocs + doman syslog-summary.1 + + insinto /etc/syslog-summary + doins ignore.rules +} + +pkg_postinst() { + elog "install sys-apps/file[python] to enable processing" + elog "of gzip compressed logfiles" +} -- 2.26.2