Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/lnav/, app-admin/lnav/files/
Date: Fri, 17 Sep 2021 02:34:07
Message-Id: 1631845873.054067d3783875810353abe20e108c0e4872150a.sam@gentoo
1 commit: 054067d3783875810353abe20e108c0e4872150a
2 Author: Brian Mego <brianmego <AT> gmail <DOT> com>
3 AuthorDate: Thu Sep 9 03:23:24 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 17 02:31:13 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=054067d3
7
8 app-admin/lnav: 0.10.0-r1 version bump
9
10 Closes: https://bugs.gentoo.org/812191
11 Package-Manager: Portage-3.0.20, Repoman-3.0.3
12 Signed-off-by: Brian Mego <brianmego <AT> gmail.com>
13 Closes: https://github.com/gentoo/gentoo/pull/22250
14 Signed-off-by: Sam James <sam <AT> gentoo.org>
15
16 app-admin/lnav/Manifest | 1 +
17 .../files/lnav-0.10.0-disable-remote-tests.patch | 75 ++++++++++++++++++++++
18 .../lnav/files/lnav-0.10.0-disable-tests.patch | 34 ++++++++++
19 app-admin/lnav/lnav-0.10.0.ebuild | 42 ++++++++++++
20 4 files changed, 152 insertions(+)
21
22 diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest
23 index e99a849c399..5776fb8f7d8 100644
24 --- a/app-admin/lnav/Manifest
25 +++ b/app-admin/lnav/Manifest
26 @@ -1,2 +1,3 @@
27 +DIST lnav-0.10.0.tar.gz 5678120 BLAKE2B d64957e94cc5415e663db8ab5722e6424381aa83a2c9430397baed782b47064ed8f460f27bec6256206cabb43f20eba9318aec1991115b577fcc9c37585dd932 SHA512 d07f4e594b9b905453f4c0ac54db2612e3bed533b47f4fd5b6b0da4e27a2d3bb611cbdf9801c12b6edae045c58881ff1f458f144981fe3d8a41f8d113e847efd
28 DIST lnav-0.8.5.tar.gz 908012 BLAKE2B a53e79d9403e5f3c731c88a171ddcb62027016b6d7d16fb618aeb9857ff86d1cc9c982d23bd172cc95f5e200afe84b488422ad4fc0aeb440cf2a96506829198e SHA512 fbb61d454dc89388aeaaeca6ba1366f84cbd75260ef8e2f26a4208ab22f175886438dad7f40e4c21089209c7713c1ebcc3a722a248083c8d55f264cf139a79fe
29 DIST lnav-0.9.0.tar.gz 1094734 BLAKE2B 79d6b035d9fc1efba618dbbd0924dbac2c8a2b3316849164c8c1a3782c7e8b85f12ade02a973d0c4fabff64b38e26fd579f1931aeafb05396ece7e75608cfc5d SHA512 4f03c83003b262c6aa1d1e87d61b4a3ae8f1ccd33a2df1b451f263d3925791d3b46285bbe276d89733a2bd464be9029e7100ce12fdfe3e009a089f250e601151
30
31 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
32 new file mode 100644
33 index 00000000000..2177cc1adf3
34 --- /dev/null
35 +++ b/app-admin/lnav/files/lnav-0.10.0-disable-remote-tests.patch
36 @@ -0,0 +1,75 @@
37 +--- lnav-0.10.0/test/test_remote.sh
38 ++++ lnav-0.10.0/test/test_remote.sh
39 +@@ -76,38 +76,38 @@
40 + error: unable to open file: nonexistent-host: -- failed to ssh to host: ...
41 + EOF
42 +
43 +-run_test ${lnav_test} -d /tmp/lnav.err -n \
44 +- localhost:nonexistent-file
45 ++# run_test ${lnav_test} -d /tmp/lnav.err -n \
46 ++# localhost:nonexistent-file
47 +
48 +-check_error_output "no error for nonexistent-file?" <<EOF
49 +-error: unable to open file: localhost:nonexistent-file -- unable to lstat -- ENOENT[2]
50 +-EOF
51 +-
52 +-run_test ${lnav_test} -d /tmp/lnav.err -n \
53 +- localhost:${test_dir}/logfile_access_log.0
54 +-
55 +-check_output "could not download remote file?" <<EOF
56 +-192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7"
57 +-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"
58 +-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"
59 +-EOF
60 +-
61 +-run_test ${lnav_test} -d /tmp/lnav.err -n \
62 +- "localhost:${test_dir}/logfile_access_log.*"
63 +-
64 +-check_output "could not download remote file?" <<EOF
65 +-192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7"
66 +-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"
67 +-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"
68 +-10.112.81.15 - - [15/Feb/2013:06:00:31 +0000] "-" 400 0 "-" "-"
69 +-EOF
70 +-
71 +-run_test ${lnav_test} -d /tmp/lnav.err -n \
72 +- "localhost:${test_dir}/remote-log-dir"
73 +-
74 +-check_output "could not download remote file?" <<EOF
75 +-192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7"
76 +-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"
77 +-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"
78 +-10.112.81.15 - - [15/Feb/2013:06:00:31 +0000] "-" 400 0 "-" "-"
79 +-EOF
80 ++# check_error_output "no error for nonexistent-file?" <<EOF
81 ++# error: unable to open file: localhost:nonexistent-file -- unable to lstat -- ENOENT[2]
82 ++# EOF
83 ++
84 ++# run_test ${lnav_test} -d /tmp/lnav.err -n \
85 ++# localhost:${test_dir}/logfile_access_log.0
86 ++
87 ++# check_output "could not download remote file?" <<EOF
88 ++# 192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7"
89 ++# 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"
90 ++# 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"
91 ++# EOF
92 ++
93 ++# run_test ${lnav_test} -d /tmp/lnav.err -n \
94 ++# "localhost:${test_dir}/logfile_access_log.*"
95 ++
96 ++# check_output "could not download remote file?" <<EOF
97 ++# 192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7"
98 ++# 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"
99 ++# 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"
100 ++# 10.112.81.15 - - [15/Feb/2013:06:00:31 +0000] "-" 400 0 "-" "-"
101 ++# EOF
102 ++
103 ++# run_test ${lnav_test} -d /tmp/lnav.err -n \
104 ++# "localhost:${test_dir}/remote-log-dir"
105 ++
106 ++# check_output "could not download remote file?" <<EOF
107 ++# 192.168.202.254 - - [20/Jul/2009:22:59:26 +0000] "GET /vmw/cgi/tramp HTTP/1.0" 200 134 "-" "gPXE/0.9.7"
108 ++# 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"
109 ++# 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"
110 ++# 10.112.81.15 - - [15/Feb/2013:06:00:31 +0000] "-" 400 0 "-" "-"
111 ++# EOF
112
113 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
114 new file mode 100644
115 index 00000000000..48a7e9b8cd4
116 --- /dev/null
117 +++ b/app-admin/lnav/files/lnav-0.10.0-disable-tests.patch
118 @@ -0,0 +1,34 @@
119 +# Certain tests commented out for stability reasons:
120 +# listview: Fails when building inside sandbox
121 +# mvattrline: Fails on some testers boxes. Documented here: https://github.com/tstack/lnav/issues/911
122 +# logfile: Flaky. Fails some times and not others. i.e. Race condition
123 +# tui: Can hang the build
124 +--- lnav-0.10.0/test/Makefile.am
125 ++++ lnav-0.10.0/test/Makefile.am
126 +@@ -355,14 +355,14 @@
127 + test_cli.sh \
128 + test_cmds.sh \
129 + test_config.sh \
130 +- test_listview.sh \
131 ++ #test_listview.sh \
132 + test_meta.sh \
133 +- test_mvwattrline.sh \
134 ++ #test_mvwattrline.sh \
135 + test_grep_proc.sh \
136 + test_grep_proc2 \
137 + test_json_format.sh \
138 + test_log_accel \
139 +- test_logfile.sh \
140 ++ #test_logfile.sh \
141 + test_reltime \
142 + test_remote.sh \
143 + test_scripts.sh \
144 +@@ -376,7 +376,7 @@
145 + test_sql_str_func.sh \
146 + test_sql_time_func.sh \
147 + test_sql_xml_func.sh \
148 +- test_tui.sh \
149 ++ #test_tui.sh \
150 + test_data_parser.sh \
151 + test_pretty_print.sh \
152 + test_view_colors.sh \
153
154 diff --git a/app-admin/lnav/lnav-0.10.0.ebuild b/app-admin/lnav/lnav-0.10.0.ebuild
155 new file mode 100644
156 index 00000000000..c7d1b21547a
157 --- /dev/null
158 +++ b/app-admin/lnav/lnav-0.10.0.ebuild
159 @@ -0,0 +1,42 @@
160 +# Copyright 1999-2021 Gentoo Authors
161 +# Distributed under the terms of the GNU General Public License v2
162 +
163 +EAPI=7
164 +
165 +inherit autotools
166 +
167 +DESCRIPTION="A curses-based tool for viewing and analyzing log files"
168 +HOMEPAGE="https://lnav.org"
169 +SRC_URI="https://github.com/tstack/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
170 +
171 +LICENSE="BSD-2"
172 +SLOT="0"
173 +KEYWORDS="~amd64 ~x86"
174 +IUSE="unicode"
175 +
176 +RDEPEND="
177 + app-arch/bzip2:0=
178 + >=dev-db/sqlite-3.9.0
179 + dev-libs/libpcre[cxx]
180 + >=net-misc/curl-7.23.0
181 + sys-libs/ncurses:=[unicode(+)?]
182 + sys-libs/readline:0=
183 + sys-libs/zlib:0="
184 +DEPEND="${RDEPEND}"
185 +
186 +DOCS=( AUTHORS NEWS README )
187 +PATCHES=(
188 + "${FILESDIR}"/${PN}-0.10.0-disable-tests.patch
189 + "${FILESDIR}"/${PN}-0.10.0-disable-remote-tests.patch
190 +)
191 +
192 +src_prepare() {
193 + default
194 + eautoreconf
195 +}
196 +
197 +src_configure() {
198 + econf \
199 + --disable-static \
200 + $(use_with unicode ncursesw)
201 +}
Report Message
Find on MARC Find on Google Groups