* [gentoo-commits] repo/gentoo:master commit in: app-admin/lnav/, app-admin/lnav/files/
@ 2018-03-19 20:20 Tim Harder
0 siblings, 0 replies; 8+ messages in thread
From: Tim Harder @ 2018-03-19 20:20 UTC (permalink / raw
To: gentoo-commits
commit: 235c40abc000341e9d85b152dea65e051d4e2601
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 19 20:16:28 2018 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Mon Mar 19 20:17:48 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=235c40ab
app-admin/lnav: disable another failing test
Closes: https://bugs.gentoo.org/630916
.../lnav/files/lnav-0.8.3-disable-tests.patch | 32 ++++++++++++++++++++++
app-admin/lnav/lnav-0.8.3.ebuild | 9 +-----
2 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/app-admin/lnav/files/lnav-0.8.3-disable-tests.patch b/app-admin/lnav/files/lnav-0.8.3-disable-tests.patch
new file mode 100644
index 00000000000..1f442afc3fd
--- /dev/null
+++ b/app-admin/lnav/files/lnav-0.8.3-disable-tests.patch
@@ -0,0 +1,32 @@
+Disable failing tests for bug #630916.
+
+--- lnav-0.8.3/test/Makefile.am
++++ lnav-0.8.3/test/Makefile.am
+@@ -374,7 +374,6 @@
+ test_concise \
+ test_line_buffer2 \
+ test_line_buffer.sh \
+- test_listview.sh \
+ test_grep_proc.sh \
+ test_grep_proc2 \
+ test_hist_source \
+@@ -388,18 +387,15 @@
+ test_scripts.sh \
+ test_sessions.sh \
+ test_shlexer.sh \
+- test_sql.sh \
+ test_sql_coll_func.sh \
+ test_sql_json_func.sh \
+ test_sql_fs_func.sh \
+ test_sql_str_func.sh \
+ test_sql_time_func.sh \
+- test_view_colors.sh \
+ test_vt52_curses.sh \
+ test_top_status \
+ test_data_parser.sh \
+- test_yajlpp \
+- test_pretty_print.sh
++ test_yajlpp
+
+ if HAVE_LIBCURL
+ TESTS += \
diff --git a/app-admin/lnav/lnav-0.8.3.ebuild b/app-admin/lnav/lnav-0.8.3.ebuild
index 5a47db6dfcb..4cc902a0eb9 100644
--- a/app-admin/lnav/lnav-0.8.3.ebuild
+++ b/app-admin/lnav/lnav-0.8.3.ebuild
@@ -25,17 +25,10 @@ RDEPEND="
DEPEND="${RDEPEND}"
DOCS=( AUTHORS NEWS README )
+PATCHES=( "${FILESDIR}"/${P}-disable-tests.patch )
src_prepare() {
default
-
- # skip failing tests
- sed -i \
- -e '/test_listview\.sh/d' \
- -e '/test_view_colors\.sh/d' \
- -e '/test_sql\.sh/d' \
- test/Makefile.am || die
-
eautoreconf
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/lnav/, app-admin/lnav/files/
@ 2018-12-28 6:00 Tim Harder
0 siblings, 0 replies; 8+ messages in thread
From: Tim Harder @ 2018-12-28 6:00 UTC (permalink / raw
To: gentoo-commits
commit: e0fa54e46a4bc9e7dca76ee7613fdf40adbc5064
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 28 05:48:54 2018 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Fri Dec 28 05:50:48 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0fa54e4
app-admin/lnav: version bump to 0.8.4
Closes: https://bugs.gentoo.org/664946
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>
app-admin/lnav/Manifest | 1 +
.../lnav/files/lnav-0.8.4-disable-tests.patch | 18 ++++++++++
app-admin/lnav/lnav-0.8.4.ebuild | 39 ++++++++++++++++++++++
3 files changed, 58 insertions(+)
diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest
index 5f053d0e3af..79252ac3777 100644
--- a/app-admin/lnav/Manifest
+++ b/app-admin/lnav/Manifest
@@ -1,3 +1,4 @@
DIST lnav-0.8.1.tar.gz 616105 BLAKE2B fe37599426c606ec186cd3feac5f9b1023d939a13a03f51a53f64db681c2c42a68152895d3afe17c02804d18735310d48d63338e301732fe3228465dd1d20b3b SHA512 b3514834f42ed647f40c501ad22b68a52755b0c8a558d29305c357b39e598c1386ec9e37d71e8b7e2b5833df41e5f7f398b50b84611d3e6accfb2feb2cdba952
DIST lnav-0.8.2.tar.gz 693219 BLAKE2B b58133cc54e8c1cdbaa461bef96a87b7d991de2c6d8b626243181d42719ed16c7c10f26a86fafa9aa30cc8b52982af233deb387a19a8442b426462189ffc95c0 SHA512 75c7014e013567e9a0ee78e28a6648d756de7cba3c103b10ddb974c61066db3a1c2efbd14636cb3729bd7c6a4ab534d1999d44e127b8a6728d12bd5be23f30c4
DIST lnav-0.8.3.tar.gz 785911 BLAKE2B 47800f27de0ad585082abaa2af3139d79506bc74d86c175040792eeaa89268711d8fd4b3737412a3dc59a566bb880f9c9fa248e48d665d25f24e1f139f9a1375 SHA512 21d0229abf9b572dcc426b6a5e87b8c84f4eb0a7f37ed62d0c08b7bd7c88868a13262f9c78b6af3f3a492b5853b68c8cf8f09ca8d24e77aaa2f2ad0f0f128022
+DIST lnav-0.8.4.tar.gz 840718 BLAKE2B 3efa958bf8c8031a7c53db1a5277cf5cd17acfcc50583f0a9c5097ee7aa679bc3d9b8346e5fdecf91d053aba6ca320e5e9bcb827e0b0bf5c1a12d4d03c307b87 SHA512 79ef5712dbeea941f7d0a80652d25394ca4e278c983eef0b3ad9f22ddddb90dee13dc50ae475632673575ace795f793bbb8e14b85ac4df786b94743e7a7596fb
diff --git a/app-admin/lnav/files/lnav-0.8.4-disable-tests.patch b/app-admin/lnav/files/lnav-0.8.4-disable-tests.patch
new file mode 100644
index 00000000000..6b431c33b13
--- /dev/null
+++ b/app-admin/lnav/files/lnav-0.8.4-disable-tests.patch
@@ -0,0 +1,18 @@
+--- lnav-0.8.4/test/Makefile.am
++++ lnav-0.8.4/test/Makefile.am
+@@ -373,7 +373,6 @@
+ test_concise \
+ test_line_buffer2 \
+ test_line_buffer.sh \
+- test_listview.sh \
+ test_meta.sh \
+ test_grep_proc.sh \
+ test_grep_proc2 \
+@@ -381,7 +380,6 @@
+ test_json_op.sh \
+ test_json_ptr_walk.sh \
+ test_log_accel \
+- test_logfile.sh \
+ test_pcrepp \
+ test_reltime \
+ test_scripts.sh \
diff --git a/app-admin/lnav/lnav-0.8.4.ebuild b/app-admin/lnav/lnav-0.8.4.ebuild
new file mode 100644
index 00000000000..0d788cfb299
--- /dev/null
+++ b/app-admin/lnav/lnav-0.8.4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs autotools
+
+DESCRIPTION="A curses-based tool for viewing and analyzing log files"
+HOMEPAGE="http://lnav.org"
+SRC_URI="https://github.com/tstack/lnav/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="unicode"
+
+RDEPEND="
+ app-arch/bzip2:0=
+ dev-db/sqlite:3
+ dev-libs/libpcre[cxx]
+ >=net-misc/curl-7.23.0
+ sys-libs/ncurses:0=[unicode?]
+ sys-libs/readline:0=
+ sys-libs/zlib:0="
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS README )
+PATCHES=( "${FILESDIR}"/${P}-disable-tests.patch )
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-static \
+ $(use_with unicode ncursesw)
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/lnav/, app-admin/lnav/files/
@ 2020-12-27 5:45 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2020-12-27 5:45 UTC (permalink / raw
To: gentoo-commits
commit: 60c1fd66a073d217a30eb83799f5ded28bc6a7ac
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 05:44:52 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 05:45:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60c1fd66
app-admin/lnav: style changes
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{639332-tinfow.patch => lnav-0.9.0-bug639332-tinfow.patch} | 0
app-admin/lnav/lnav-0.9.0.ebuild | 7 +++++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/app-admin/lnav/files/639332-tinfow.patch b/app-admin/lnav/files/lnav-0.9.0-bug639332-tinfow.patch
similarity index 100%
rename from app-admin/lnav/files/639332-tinfow.patch
rename to app-admin/lnav/files/lnav-0.9.0-bug639332-tinfow.patch
diff --git a/app-admin/lnav/lnav-0.9.0.ebuild b/app-admin/lnav/lnav-0.9.0.ebuild
index 79a41f429d3..64c7de8adae 100644
--- a/app-admin/lnav/lnav-0.9.0.ebuild
+++ b/app-admin/lnav/lnav-0.9.0.ebuild
@@ -25,8 +25,11 @@ RDEPEND="
DEPEND="${RDEPEND}"
DOCS=( AUTHORS NEWS README )
-# The second patch is a fix for https://bugs.gentoo.org/723242
-PATCHES=( "${FILESDIR}"/${PN}-0.8.4-disable-tests.patch "${FILESDIR}"/639332-tinfow.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.8.4-disable-tests.patch
+ # bug 723242
+ "${FILESDIR}"/${PN}-0.9.0-bug639332-tinfow.patch
+)
src_prepare() {
default
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/lnav/, app-admin/lnav/files/
@ 2021-07-13 21:49 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2021-07-13 21:49 UTC (permalink / raw
To: gentoo-commits
commit: 919ec7ae4b3e1bb25a475eb6cd1210c2d4d7c7b4
Author: Randy Barlow <randy <AT> electronsweatshop <DOT> com>
AuthorDate: Fri May 28 03:49:53 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 13 21:49:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=919ec7ae
app-admin/lnav: Backport to fix a segfault
lnav was segfaulting when the right arrow key was pressed. This
commit backports a patch from the main development branch to
address the crash.
Closes: https://bugs.gentoo.org/792582
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Randy Barlow <randy <AT> electronsweatshop.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-admin/lnav/files/lnav-0.9.0-bug792582.patch | 97 +++++++++++++++++++++++++
app-admin/lnav/lnav-0.9.0-r1.ebuild | 49 +++++++++++++
2 files changed, 146 insertions(+)
diff --git a/app-admin/lnav/files/lnav-0.9.0-bug792582.patch b/app-admin/lnav/files/lnav-0.9.0-bug792582.patch
new file mode 100644
index 00000000000..9059712242a
--- /dev/null
+++ b/app-admin/lnav/files/lnav-0.9.0-bug792582.patch
@@ -0,0 +1,97 @@
+From 141436933a8d30edfd33aa5fcfb0c93cfa3ae9d5 Mon Sep 17 00:00:00 2001
+From: Timothy Stack <timothyshanestack@gmail.com>
+Date: Wed, 9 Dec 2020 15:35:06 -0800
+Subject: [PATCH] [view_curses] use VC_ROLE instead of VC_STYLE where possible
+ and fix segv in mvwattrline
+
+Fixes #806
+
+Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
+---
+ src/highlighter.cc | 4 +++-
+ src/logfile_sub_source.cc | 17 ++++++++++-------
+ src/view_curses.cc | 9 ++++++---
+ 3 files changed, 19 insertions(+), 11 deletions(-)
+
+diff --git a/src/highlighter.cc b/src/highlighter.cc
+index 24aafebd..110ca03f 100644
+--- a/src/highlighter.cc
++++ b/src/highlighter.cc
+@@ -115,7 +115,9 @@ void highlighter::annotate(attr_line_t &al, int start) const
+ vc.match_color(this->h_bg));
+ }
+ if (this->h_role != view_colors::VCR_NONE) {
+- attrs |= vc.attrs_for_role(this->h_role);
++ sa.emplace_back(lr,
++ &view_curses::VC_ROLE,
++ this->h_role);
+ }
+ sa.emplace_back(lr, &view_curses::VC_STYLE, attrs);
+
+diff --git a/src/logfile_sub_source.cc b/src/logfile_sub_source.cc
+index 14e87002..dce0d4ae 100644
+--- a/src/logfile_sub_source.cc
++++ b/src/logfile_sub_source.cc
+@@ -468,25 +468,28 @@ void logfile_sub_source::text_attrs_for_line(textview_curses &lv,
+
+ shift_string_attrs(value_out, 0, time_offset_end);
+
+- attrs = vc.attrs_for_role(view_colors::VCR_OFFSET_TIME);
+- value_out.emplace_back(lr, &view_curses::VC_STYLE, attrs);
++ value_out.emplace_back(lr,
++ &view_curses::VC_ROLE,
++ view_colors::VCR_OFFSET_TIME);
+ value_out.emplace_back(line_range(12, 13),
+ &view_curses::VC_GRAPHIC, ACS_VLINE);
+
+- int bar_attrs = 0;
++ view_colors::role_t bar_role = view_colors::VCR_NONE;
+
+ switch (this->get_line_accel_direction(vis_line_t(row))) {
+ case log_accel::A_STEADY:
+ break;
+ case log_accel::A_DECEL:
+- bar_attrs = vc.attrs_for_role(view_colors::VCR_DIFF_DELETE);
++ bar_role = view_colors::VCR_DIFF_DELETE;
+ break;
+ case log_accel::A_ACCEL:
+- bar_attrs = vc.attrs_for_role(view_colors::VCR_DIFF_ADD);
++ bar_role = view_colors::VCR_DIFF_ADD;
+ break;
+ }
+- value_out.push_back(
+- string_attr(line_range(12, 13), &view_curses::VC_STYLE, bar_attrs));
++ if (bar_role != view_colors::VCR_NONE) {
++ value_out.emplace_back(
++ line_range(12, 13), &view_curses::VC_ROLE, bar_role);
++ }
+ }
+
+ lr.lr_start = 0;
+diff --git a/src/view_curses.cc b/src/view_curses.cc
+index 4a36a3ad..2456d53d 100644
+--- a/src/view_curses.cc
++++ b/src/view_curses.cc
+@@ -402,13 +402,16 @@ void view_curses::mvwattrline(WINDOW *window,
+ }
+ }
+
++ if (attr_range.lr_end == -1) {
++ attr_range.lr_end = line_width_chars;
++ }
++ if (attr_range.lr_end < lr_chars.lr_start) {
++ continue;
++ }
+ attr_range.lr_start = max(0, attr_range.lr_start - lr_chars.lr_start);
+ if (attr_range.lr_start > line_width_chars) {
+ continue;
+ }
+- if (attr_range.lr_end == -1) {
+- attr_range.lr_end = lr_chars.lr_start + line_width_chars;
+- }
+
+ attr_range.lr_end = min(line_width_chars, attr_range.lr_end - lr_chars.lr_start);
+
+--
+2.31.1
+
diff --git a/app-admin/lnav/lnav-0.9.0-r1.ebuild b/app-admin/lnav/lnav-0.9.0-r1.ebuild
new file mode 100644
index 00000000000..dbadbc3f293
--- /dev/null
+++ b/app-admin/lnav/lnav-0.9.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A curses-based tool for viewing and analyzing log files"
+HOMEPAGE="https://lnav.org"
+SRC_URI="https://github.com/tstack/lnav/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="unicode"
+
+RDEPEND="
+ app-arch/bzip2:0=
+ >=dev-db/sqlite-3.9.0
+ dev-libs/libpcre[cxx]
+ >=net-misc/curl-7.23.0
+ sys-libs/ncurses:0=[unicode?]
+ sys-libs/readline:0=
+ sys-libs/zlib:0="
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS README )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.8.4-disable-tests.patch
+ # bug 723242
+ "${FILESDIR}"/${PN}-0.9.0-bug639332-tinfow.patch
+ # bug 713600
+ "${FILESDIR}"/${PN}-0.9.0-bug713600_0.patch
+ "${FILESDIR}"/${PN}-0.9.0-bug713600_1.patch
+ # Fix a segfault when using right arrow
+ # bug 792582
+ "${FILESDIR}"/${PN}-0.9.0-bug792582.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-static \
+ $(use_with unicode ncursesw)
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/lnav/, app-admin/lnav/files/
@ 2021-07-13 21:49 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2021-07-13 21:49 UTC (permalink / raw
To: gentoo-commits
commit: 82f52bae544d9659015fe2ebf8c1098aec191b8e
Author: Randy Barlow <randy <AT> electronsweatshop <DOT> com>
AuthorDate: Tue May 25 03:09:04 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jul 13 21:49:04 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82f52bae
app-admin/lnav: Backport patches to fix tests
This commit backports two patches from upstream to fix test
failures in tests/test_sql.sh.
Closes: https://bugs.gentoo.org/713600
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Randy Barlow <randy <AT> electronsweatshop.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch | 36 +++++++++++++++++++++++
app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch | 32 ++++++++++++++++++++
app-admin/lnav/lnav-0.9.0.ebuild | 3 ++
3 files changed, 71 insertions(+)
diff --git a/app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch b/app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch
new file mode 100644
index 00000000000..47aef6d593d
--- /dev/null
+++ b/app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch
@@ -0,0 +1,36 @@
+From 60dde499ac87c2399ac24ae85c98ed8cce564858 Mon Sep 17 00:00:00 2001
+From: Timothy Stack <timothyshanestack@gmail.com>
+Date: Thu, 31 Dec 2020 23:23:56 -0800
+Subject: [PATCH] [tests] fix test to make it insensitive to the current date
+
+Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
+---
+ test/test_sql.sh | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/test/test_sql.sh b/test/test_sql.sh
+index c7480ecc..bbb98dce 100644
+--- a/test/test_sql.sh
++++ b/test/test_sql.sh
+@@ -1012,13 +1012,13 @@ EOF
+
+
+ cat ${test_dir}/logfile_syslog.0 | run_test ${lnav_test} -n \
+- -c ";select log_time from syslog_log where log_procname = 'automount'"
++ -c ";select log_body from syslog_log where log_procname = 'automount'"
+
+ check_output "querying against stdin is not working?" <<EOF
+- log_time
+-2020-11-03 09:23:38.000
+-2020-11-03 09:23:38.000
+-2020-11-03 09:23:38.000
++ log_body
++ lookup(file): lookup for foobar failed
++ attempting to mount entry /auto/opt
++ lookup(file): lookup for opt failed
+ EOF
+
+
+--
+2.31.1
+
diff --git a/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch b/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch
new file mode 100644
index 00000000000..58aa7264a0d
--- /dev/null
+++ b/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch
@@ -0,0 +1,32 @@
+From cc072d29ead6f1df896bc61b83d7d41dab0b7132 Mon Sep 17 00:00:00 2001
+From: Timothy Stack <timothyshanestack@gmail.com>
+Date: Thu, 31 Dec 2020 23:26:57 -0800
+Subject: [PATCH] [tests] update another date-sensitive test
+
+Signed-off-by: Randy Barlow <randy@electronsweatshop.com>
+---
+ test/test_sql.sh | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/test/test_sql.sh b/test/test_sql.sh
+index bbb98dce..22941c2a 100644
+--- a/test/test_sql.sh
++++ b/test/test_sql.sh
+@@ -1023,11 +1023,11 @@ EOF
+
+
+ cat ${test_dir}/logfile_syslog.0 | run_test ${lnav_test} -n \
+- -c ";select log_time from syslog_log where log_procname = 'sudo'"
++ -c ";select log_body from syslog_log where log_procname = 'sudo'"
+
+ check_output "single result is not working?" <<EOF
+- log_time
+-2020-11-03 09:47:02.000
++ log_body
++ timstack : TTY=pts/6 ; PWD=/auto/wstimstack/rpms/lbuild/test ; USER=root ; COMMAND=/usr/bin/tail /var/log/messages
+ EOF
+
+ # Create a dummy database for the next couple of tests to consume.
+--
+2.31.1
+
diff --git a/app-admin/lnav/lnav-0.9.0.ebuild b/app-admin/lnav/lnav-0.9.0.ebuild
index 73758b4838f..bc2f04f4935 100644
--- a/app-admin/lnav/lnav-0.9.0.ebuild
+++ b/app-admin/lnav/lnav-0.9.0.ebuild
@@ -29,6 +29,9 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.8.4-disable-tests.patch
# bug 723242
"${FILESDIR}"/${PN}-0.9.0-bug639332-tinfow.patch
+ # bug 713600
+ "${FILESDIR}"/${PN}-0.9.0-bug713600_0.patch
+ "${FILESDIR}"/${PN}-0.9.0-bug713600_1.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/lnav/, app-admin/lnav/files/
@ 2021-09-17 2:34 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2021-09-17 2:34 UTC (permalink / raw
To: gentoo-commits
commit: 054067d3783875810353abe20e108c0e4872150a
Author: Brian Mego <brianmego <AT> gmail <DOT> com>
AuthorDate: Thu Sep 9 03:23:24 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 17 02:31:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=054067d3
app-admin/lnav: 0.10.0-r1 version bump
Closes: https://bugs.gentoo.org/812191
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Brian Mego <brianmego <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22250
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-admin/lnav/Manifest | 1 +
.../files/lnav-0.10.0-disable-remote-tests.patch | 75 ++++++++++++++++++++++
.../lnav/files/lnav-0.10.0-disable-tests.patch | 34 ++++++++++
app-admin/lnav/lnav-0.10.0.ebuild | 42 ++++++++++++
4 files changed, 152 insertions(+)
diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest
index e99a849c399..5776fb8f7d8 100644
--- a/app-admin/lnav/Manifest
+++ b/app-admin/lnav/Manifest
@@ -1,2 +1,3 @@
+DIST lnav-0.10.0.tar.gz 5678120 BLAKE2B d64957e94cc5415e663db8ab5722e6424381aa83a2c9430397baed782b47064ed8f460f27bec6256206cabb43f20eba9318aec1991115b577fcc9c37585dd932 SHA512 d07f4e594b9b905453f4c0ac54db2612e3bed533b47f4fd5b6b0da4e27a2d3bb611cbdf9801c12b6edae045c58881ff1f458f144981fe3d8a41f8d113e847efd
DIST lnav-0.8.5.tar.gz 908012 BLAKE2B a53e79d9403e5f3c731c88a171ddcb62027016b6d7d16fb618aeb9857ff86d1cc9c982d23bd172cc95f5e200afe84b488422ad4fc0aeb440cf2a96506829198e SHA512 fbb61d454dc89388aeaaeca6ba1366f84cbd75260ef8e2f26a4208ab22f175886438dad7f40e4c21089209c7713c1ebcc3a722a248083c8d55f264cf139a79fe
DIST lnav-0.9.0.tar.gz 1094734 BLAKE2B 79d6b035d9fc1efba618dbbd0924dbac2c8a2b3316849164c8c1a3782c7e8b85f12ade02a973d0c4fabff64b38e26fd579f1931aeafb05396ece7e75608cfc5d SHA512 4f03c83003b262c6aa1d1e87d61b4a3ae8f1ccd33a2df1b451f263d3925791d3b46285bbe276d89733a2bd464be9029e7100ce12fdfe3e009a089f250e601151
diff --git a/app-admin/lnav/files/lnav-0.10.0-disable-remote-tests.patch b/app-admin/lnav/files/lnav-0.10.0-disable-remote-tests.patch
new file mode 100644
index 00000000000..2177cc1adf3
--- /dev/null
+++ b/app-admin/lnav/files/lnav-0.10.0-disable-remote-tests.patch
@@ -0,0 +1,75 @@
+--- lnav-0.10.0/test/test_remote.sh
++++ lnav-0.10.0/test/test_remote.sh
+@@ -76,38 +76,38 @@
+ error: unable to open file: nonexistent-host: -- failed to ssh to host: ...
+ EOF
+
+-run_test ${lnav_test} -d /tmp/lnav.err -n \
+- localhost:nonexistent-file
++# run_test ${lnav_test} -d /tmp/lnav.err -n \
++# localhost:nonexistent-file
+
+-check_error_output "no error for nonexistent-file?" <<EOF
+-error: unable to open file: localhost:nonexistent-file -- unable to lstat -- ENOENT[2]
+-EOF
+-
+-run_test ${lnav_test} -d /tmp/lnav.err -n \
+- localhost:${test_dir}/logfile_access_log.0
+-
+-check_output "could not download remote file?" <<EOF
+-192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7"
+-192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkboot.gz HTTP/1.0" 404 46210 "-" "gPXE/0.9.7"
+-192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkernel.gz HTTP/1.0" 200 78929 "-" "gPXE/0.9.7"
+-EOF
+-
+-run_test ${lnav_test} -d /tmp/lnav.err -n \
+- "localhost:${test_dir}/logfile_access_log.*"
+-
+-check_output "could not download remote file?" <<EOF
+-192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7"
+-192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkboot.gz HTTP/1.0" 404 46210 "-" "gPXE/0.9.7"
+-192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkernel.gz HTTP/1.0" 200 78929 "-" "gPXE/0.9.7"
+-10.112.81.15 - - [15/Feb/2013:06:00:31 +0000] "-" 400 0 "-" "-"
+-EOF
+-
+-run_test ${lnav_test} -d /tmp/lnav.err -n \
+- "localhost:${test_dir}/remote-log-dir"
+-
+-check_output "could not download remote file?" <<EOF
+-192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7"
+-192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkboot.gz HTTP/1.0" 404 46210 "-" "gPXE/0.9.7"
+-192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkernel.gz HTTP/1.0" 200 78929 "-" "gPXE/0.9.7"
+-10.112.81.15 - - [15/Feb/2013:06:00:31 +0000] "-" 400 0 "-" "-"
+-EOF
++# check_error_output "no error for nonexistent-file?" <<EOF
++# error: unable to open file: localhost:nonexistent-file -- unable to lstat -- ENOENT[2]
++# EOF
++
++# run_test ${lnav_test} -d /tmp/lnav.err -n \
++# localhost:${test_dir}/logfile_access_log.0
++
++# check_output "could not download remote file?" <<EOF
++# 192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7"
++# 192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkboot.gz HTTP/1.0" 404 46210 "-" "gPXE/0.9.7"
++# 192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkernel.gz HTTP/1.0" 200 78929 "-" "gPXE/0.9.7"
++# EOF
++
++# run_test ${lnav_test} -d /tmp/lnav.err -n \
++# "localhost:${test_dir}/logfile_access_log.*"
++
++# check_output "could not download remote file?" <<EOF
++# 192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7"
++# 192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkboot.gz HTTP/1.0" 404 46210 "-" "gPXE/0.9.7"
++# 192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkernel.gz HTTP/1.0" 200 78929 "-" "gPXE/0.9.7"
++# 10.112.81.15 - - [15/Feb/2013:06:00:31 +0000] "-" 400 0 "-" "-"
++# EOF
++
++# run_test ${lnav_test} -d /tmp/lnav.err -n \
++# "localhost:${test_dir}/remote-log-dir"
++
++# check_output "could not download remote file?" <<EOF
++# 192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7"
++# 192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkboot.gz HTTP/1.0" 404 46210 "-" "gPXE/0.9.7"
++# 192.168.202.254 - - [20/Jul/2009:22:59:29 +0000] "GET /vmw/vSphere/default/vmkernel.gz HTTP/1.0" 200 78929 "-" "gPXE/0.9.7"
++# 10.112.81.15 - - [15/Feb/2013:06:00:31 +0000] "-" 400 0 "-" "-"
++# EOF
diff --git a/app-admin/lnav/files/lnav-0.10.0-disable-tests.patch b/app-admin/lnav/files/lnav-0.10.0-disable-tests.patch
new file mode 100644
index 00000000000..48a7e9b8cd4
--- /dev/null
+++ b/app-admin/lnav/files/lnav-0.10.0-disable-tests.patch
@@ -0,0 +1,34 @@
+# Certain tests commented out for stability reasons:
+# listview: Fails when building inside sandbox
+# mvattrline: Fails on some testers boxes. Documented here: https://github.com/tstack/lnav/issues/911
+# logfile: Flaky. Fails some times and not others. i.e. Race condition
+# tui: Can hang the build
+--- lnav-0.10.0/test/Makefile.am
++++ lnav-0.10.0/test/Makefile.am
+@@ -355,14 +355,14 @@
+ test_cli.sh \
+ test_cmds.sh \
+ test_config.sh \
+- test_listview.sh \
++ #test_listview.sh \
+ test_meta.sh \
+- test_mvwattrline.sh \
++ #test_mvwattrline.sh \
+ test_grep_proc.sh \
+ test_grep_proc2 \
+ test_json_format.sh \
+ test_log_accel \
+- test_logfile.sh \
++ #test_logfile.sh \
+ test_reltime \
+ test_remote.sh \
+ test_scripts.sh \
+@@ -376,7 +376,7 @@
+ test_sql_str_func.sh \
+ test_sql_time_func.sh \
+ test_sql_xml_func.sh \
+- test_tui.sh \
++ #test_tui.sh \
+ test_data_parser.sh \
+ test_pretty_print.sh \
+ test_view_colors.sh \
diff --git a/app-admin/lnav/lnav-0.10.0.ebuild b/app-admin/lnav/lnav-0.10.0.ebuild
new file mode 100644
index 00000000000..c7d1b21547a
--- /dev/null
+++ b/app-admin/lnav/lnav-0.10.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="A curses-based tool for viewing and analyzing log files"
+HOMEPAGE="https://lnav.org"
+SRC_URI="https://github.com/tstack/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="unicode"
+
+RDEPEND="
+ app-arch/bzip2:0=
+ >=dev-db/sqlite-3.9.0
+ dev-libs/libpcre[cxx]
+ >=net-misc/curl-7.23.0
+ sys-libs/ncurses:=[unicode(+)?]
+ sys-libs/readline:0=
+ sys-libs/zlib:0="
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS NEWS README )
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.10.0-disable-tests.patch
+ "${FILESDIR}"/${PN}-0.10.0-disable-remote-tests.patch
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --disable-static \
+ $(use_with unicode ncursesw)
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/lnav/, app-admin/lnav/files/
@ 2023-01-21 20:42 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2023-01-21 20:42 UTC (permalink / raw
To: gentoo-commits
commit: 69504c316cdb25bc2d97e27ea16b8e25ecdb9c35
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 21 18:18:25 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 21 20:41:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69504c31
app-admin/lnav: fix build w/ gcc 13
Signed-off-by: Sam James <sam <AT> gentoo.org>
...d-with-GCC-13-add-missing-cstdint-include.patch | 26 ++++++++++++++++++++++
app-admin/lnav/lnav-0.11.1-r1.ebuild | 1 +
2 files changed, 27 insertions(+)
diff --git a/app-admin/lnav/files/lnav-0.11.1-0001-Fix-build-with-GCC-13-add-missing-cstdint-include.patch b/app-admin/lnav/files/lnav-0.11.1-0001-Fix-build-with-GCC-13-add-missing-cstdint-include.patch
new file mode 100644
index 000000000000..0dffeeb9bdbb
--- /dev/null
+++ b/app-admin/lnav/files/lnav-0.11.1-0001-Fix-build-with-GCC-13-add-missing-cstdint-include.patch
@@ -0,0 +1,26 @@
+https://github.com/tstack/lnav/pull/1112
+
+From e25d3e3c69fcf57bbaec2333846b9a43c4d1fc90 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 21 Jan 2023 18:11:20 +0000
+Subject: [PATCH] Fix build with GCC 13 (add missing <cstdint> include)
+
+GCC 13 (as usual for new compiler releases) shuffles around some
+internal includes and so <cstdint> is no longer transitively included.
+
+Explicitly include <cstdint> for uint32_t.
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/src/base/lnav_log.hh
++++ b/src/base/lnav_log.hh
+@@ -32,6 +32,7 @@
+ #ifndef lnav_log_hh
+ #define lnav_log_hh
+
++#include <cstdint>
+ #include <string>
+
+ #include <stdio.h>
+--
+2.39.1
+
diff --git a/app-admin/lnav/lnav-0.11.1-r1.ebuild b/app-admin/lnav/lnav-0.11.1-r1.ebuild
index ee120eaf93e0..2fe5510f0da9 100644
--- a/app-admin/lnav/lnav-0.11.1-r1.ebuild
+++ b/app-admin/lnav/lnav-0.11.1-r1.ebuild
@@ -36,6 +36,7 @@ DOCS=( AUTHORS NEWS.md README )
PATCHES=(
"${FILESDIR}"/${PN}-0.11.0-disable-tests.patch
+ "${FILESDIR}"/0001-Fix-build-with-GCC-13-add-missing-cstdint-include.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-admin/lnav/, app-admin/lnav/files/
@ 2024-07-24 7:12 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2024-07-24 7:12 UTC (permalink / raw
To: gentoo-commits
commit: 4f7560c3d191c2b993901d18c1c812441a3d86ed
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 24 07:10:22 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 24 07:10:22 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f7560c3
app-admin/lnav: drop 0.11.1-r2
Signed-off-by: Sam James <sam <AT> gentoo.org>
app-admin/lnav/Manifest | 1 -
...d-with-GCC-13-add-missing-cstdint-include.patch | 26 ----------
app-admin/lnav/lnav-0.11.1-r2.ebuild | 55 ----------------------
3 files changed, 82 deletions(-)
diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest
index 8561cd07dd0a..39e13c144333 100644
--- a/app-admin/lnav/Manifest
+++ b/app-admin/lnav/Manifest
@@ -1,2 +1 @@
-DIST lnav-0.11.1.tar.gz 10268167 BLAKE2B d490c6798685e80021437e1771742dee59c3b5109a43591581f4ddc15528c5b616ab915418fa78b7cf13a82bce582baf0516b5b2339f5fa32054359c21908852 SHA512 6c7d2b603ee04bb2cee16bf28b0161ebe7bf3ec838bed765f9852f79ee1ff8a56691dcaa66998e0ef58f16f16274bf93c7f2eb8f2e58264faf284bcfd25818ef
DIST lnav-0.11.2.tar.gz 12379373 BLAKE2B 513e10f44d3770fb0135ad7fd035d07b35d2a44b2745acf700de0bf82ef428eb1549f9fd389ae4d6e3e268378a980f59f164479390a2a3faea16555941d3c9ca SHA512 a48c81e075923a5e1cdb051dd18329ff417f628518c8273fc19d0787226414668e1c29645edf20a46173fdf65a2b8978517948317fdc8b45c772fdc82cb82154
diff --git a/app-admin/lnav/files/lnav-0.11.1-0001-Fix-build-with-GCC-13-add-missing-cstdint-include.patch b/app-admin/lnav/files/lnav-0.11.1-0001-Fix-build-with-GCC-13-add-missing-cstdint-include.patch
deleted file mode 100644
index 0dffeeb9bdbb..000000000000
--- a/app-admin/lnav/files/lnav-0.11.1-0001-Fix-build-with-GCC-13-add-missing-cstdint-include.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://github.com/tstack/lnav/pull/1112
-
-From e25d3e3c69fcf57bbaec2333846b9a43c4d1fc90 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 21 Jan 2023 18:11:20 +0000
-Subject: [PATCH] Fix build with GCC 13 (add missing <cstdint> include)
-
-GCC 13 (as usual for new compiler releases) shuffles around some
-internal includes and so <cstdint> is no longer transitively included.
-
-Explicitly include <cstdint> for uint32_t.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/src/base/lnav_log.hh
-+++ b/src/base/lnav_log.hh
-@@ -32,6 +32,7 @@
- #ifndef lnav_log_hh
- #define lnav_log_hh
-
-+#include <cstdint>
- #include <string>
-
- #include <stdio.h>
---
-2.39.1
-
diff --git a/app-admin/lnav/lnav-0.11.1-r2.ebuild b/app-admin/lnav/lnav-0.11.1-r2.ebuild
deleted file mode 100644
index 18fee38a20e9..000000000000
--- a/app-admin/lnav/lnav-0.11.1-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="A curses-based tool for viewing and analyzing log files"
-HOMEPAGE="https://lnav.org"
-SRC_URI="https://github.com/tstack/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pcap test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- app-arch/bzip2:0=
- app-arch/libarchive:=
- >=dev-db/sqlite-3.9.0
- dev-libs/libpcre2
- >=net-misc/curl-7.23.0
- sys-libs/ncurses:=
- sys-libs/readline:=
- sys-libs/zlib:=
- pcap? ( net-analyzer/wireshark[tshark] )"
-# The tests use ssh-keygen and use dsa and rsa keys (which is why ssl is required)
-DEPEND="${RDEPEND}
- test? (
- virtual/openssh[ssl]
- dev-cpp/doctest
- )"
-
-DOCS=( AUTHORS NEWS.md README )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.11.0-disable-tests.patch
- "${FILESDIR}"/${PN}-0.11.1-0001-Fix-build-with-GCC-13-add-missing-cstdint-include.patch
-)
-
-src_prepare() {
- default
-
- eautoreconf
-}
-
-src_configure() {
- filter-lto
-
- econf \
- --disable-static \
- --with-ncurses \
- $(use_with test system-doctest)
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-07-24 7:12 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-17 2:34 [gentoo-commits] repo/gentoo:master commit in: app-admin/lnav/, app-admin/lnav/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-07-24 7:12 Sam James
2023-01-21 20:42 Sam James
2021-07-13 21:49 Sam James
2021-07-13 21:49 Sam James
2020-12-27 5:45 Sam James
2018-12-28 6:00 Tim Harder
2018-03-19 20:20 Tim Harder
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox