public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Joonas Niilola" <juippis@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/syslog-summary/, app-admin/syslog-summary/files/
Date: Tue, 12 Nov 2019 05:36:13 +0000 (UTC)	[thread overview]
Message-ID: <1573536323.6118d6de5092f48f2cae7a2d380e1caef78ab8e0.juippis@gentoo> (raw)

commit:     6118d6de5092f48f2cae7a2d380e1caef78ab8e0
Author:     Paul Healy <lmiphay <AT> gmail <DOT> com>
AuthorDate: Mon Oct 28 14:19:39 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Nov 12 05:25:23 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6118d6de

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 <lmiphay <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13477
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../syslog-summary-1.14-fix-ignore-code.patch      | 12 ++++++
 .../syslog-summary/syslog-summary-1.14-r3.ebuild   | 49 ++++++++++++++++++++++
 2 files changed, 61 insertions(+)

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 00000000000..b66a0ad51ce
--- /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 00000000000..75c1c04b246
--- /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"
+}


             reply	other threads:[~2019-11-12  5:36 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-12  5:36 Joonas Niilola [this message]
  -- strict thread matches above, loose matches on Subject: below --
2020-06-28 10:41 [gentoo-commits] repo/gentoo:master commit in: app-admin/syslog-summary/, app-admin/syslog-summary/files/ Joonas Niilola
2020-08-31 17:16 Aaron Bauman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1573536323.6118d6de5092f48f2cae7a2d380e1caef78ab8e0.juippis@gentoo \
    --to=juippis@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox