diff options
Diffstat (limited to 'app-admin/lnav')
19 files changed, 172 insertions, 1106 deletions
diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest index 570800713387..8561cd07dd0a 100644 --- a/app-admin/lnav/Manifest +++ b/app-admin/lnav/Manifest @@ -1,3 +1,2 @@ -DIST lnav-0.10.0.tar.gz 5678120 BLAKE2B d64957e94cc5415e663db8ab5722e6424381aa83a2c9430397baed782b47064ed8f460f27bec6256206cabb43f20eba9318aec1991115b577fcc9c37585dd932 SHA512 d07f4e594b9b905453f4c0ac54db2612e3bed533b47f4fd5b6b0da4e27a2d3bb611cbdf9801c12b6edae045c58881ff1f458f144981fe3d8a41f8d113e847efd -DIST lnav-0.10.1.tar.gz 5707151 BLAKE2B ae82b705830c6ea38e2fa4f3832a2fd1d8ce8b5ef00d6a3fe750e4f5e7080ae29fde845f2c5055e2684aad1959368ff90abdc130130f8d6f0152426487e7396c SHA512 fff9632c1acbef80ba9d4214fd3ef485727792353fe493cfa4f2e9412bb371f50f2e1a735ded3d7bd8b16df5e93e03b0f3def296770e7dd0ad2206fd9f94690d -DIST lnav-0.9.0.tar.gz 1094734 BLAKE2B 79d6b035d9fc1efba618dbbd0924dbac2c8a2b3316849164c8c1a3782c7e8b85f12ade02a973d0c4fabff64b38e26fd579f1931aeafb05396ece7e75608cfc5d SHA512 4f03c83003b262c6aa1d1e87d61b4a3ae8f1ccd33a2df1b451f263d3925791d3b46285bbe276d89733a2bd464be9029e7100ce12fdfe3e009a089f250e601151 +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.10.0-disable-remote-tests.patch b/app-admin/lnav/files/lnav-0.10.0-disable-remote-tests.patch deleted file mode 100644 index 5e8c80fb90a5..000000000000 --- a/app-admin/lnav/files/lnav-0.10.0-disable-remote-tests.patch +++ /dev/null @@ -1,75 +0,0 @@ ---- a/test/test_remote.sh -+++ b/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 deleted file mode 100644 index c7a49d45f1d7..000000000000 --- a/app-admin/lnav/files/lnav-0.10.0-disable-tests.patch +++ /dev/null @@ -1,34 +0,0 @@ -# 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 ---- a/test/Makefile.am -+++ b/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/files/lnav-0.10.0-use-system-doctest.patch b/app-admin/lnav/files/lnav-0.10.0-use-system-doctest.patch deleted file mode 100644 index 09fe364487bf..000000000000 --- a/app-admin/lnav/files/lnav-0.10.0-use-system-doctest.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 85515b2c196f2e361e93c158201f74177dc4ae37 Mon Sep 17 00:00:00 2001 -From: Randy Barlow <randy@electronsweatshop.com> -Date: Sat, 18 Sep 2021 21:56:19 -0400 -Subject: [PATCH] Provide a configure flag to use the system doctest - -This will allow distributions to more easily maintain -incompatibilies between doctest and the rest of their software. - -Fixes #912 - -Signed-off-by: Randy Barlow <randy@electronsweatshop.com> ---- - configure.ac | 21 + - src/Makefile.am | 4 + - src/doctest.hh | 5502 +-------------------------------------- - src/doctest_vendored.hh | 5464 ++++++++++++++++++++++++++++++++++++++ - 4 files changed, 5527 insertions(+), 5464 deletions(-) - create mode 100644 src/doctest_vendored.hh - -diff --git a/configure.ac b/configure.ac -index f2127def..33746d1e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -153,6 +153,27 @@ AS_IF([test "x$enable_simd" = "xyes"], [ - ]) - - -+AC_ARG_WITH([system_doctest], -+ AS_HELP_STRING( -+ [--with-system-doctest], -+ [Use the system provided doctest library rather than the bundled one] -+ ), -+ [], [] -+) -+ -+AS_IF([test "x$with_system_doctest" = "xyes"], [ -+ AC_CHECK_HEADERS(doctest/doctest.h) -+ AS_IF([test "x$ac_cv_header_doctest_doctest_h" != "xyes"], [ -+ AC_MSG_ERROR([system doctest not found])dnl -+ ]) -+ AC_DEFINE([DOCTEST_HEADER], ["doctest/doctest.h"], [doctest include path]) -+]) -+AS_IF([test "x$with_system_doctest" != "xyes"], [ -+ AC_DEFINE([DOCTEST_HEADER], ["doctest_vendored.hh"], [doctest include path]) -+ AS_VAR_SET(doctest_vendored_h, "doctest_vendored.hh") -+ AC_SUBST(doctest_vendored_h) -+]) -+ - - LNAV_WITH_JEMALLOC - -diff --git a/src/Makefile.am b/src/Makefile.am -index 9be9168e..8dc0cd94 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -151,6 +151,9 @@ dist_noinst_DATA = \ - $(FORMAT_FILES) \ - xterm-palette.json - -+EXTRA_HEADERS = \ -+ doctest_vendored.hh -+ - noinst_HEADERS = \ - all_logs_vtab.hh \ - ansi_scrubber.hh \ -@@ -174,6 +177,7 @@ noinst_HEADERS = \ - db_sub_source.hh \ - doc_status_source.hh \ - doctest.hh \ -+ $(doctest_vendored_h) \ - elem_to_json.hh \ - environ_vtab.hh \ - field_overlay_source.hh \ diff --git a/app-admin/lnav/files/lnav-0.10.1-gcc12.patch b/app-admin/lnav/files/lnav-0.10.1-gcc12.patch deleted file mode 100644 index 6ed4a73cebb2..000000000000 --- a/app-admin/lnav/files/lnav-0.10.1-gcc12.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://bugs.gentoo.org/839909 -https://github.com/tstack/lnav/pull/961 - -From b8a31ae9b4bcd5690a2b3d2fbd6373caffbc4a57 Mon Sep 17 00:00:00 2001 -From: Peter Schiffer <3899107+pschiffe@users.noreply.github.com> -Date: Mon, 21 Feb 2022 21:09:30 +0100 -Subject: [PATCH] Add `#include <iterator>` to `string_util.cc` - -Lnav fails to build on the next Fedora version due to the following error: -``` -make[3]: Entering directory '/builddir/build/BUILD/lnav-0.10.1/src/base' -g++ -std=c++14 -DHAVE_CONFIG_H -I. -I../../src -Wall -I../../src/ -I../../src/third-party -I../../src/fmtlib -I../../src/third-party/doctest-root -I/usr/local/include -D_ISOC99_SOURCE -D__STDC_LIMIT_MACROS -D_GNU_SOURCE -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 -m64 -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -c -o string_util.o string_util.cc -make[3]: Leaving directory '/builddir/build/BUILD/lnav-0.10.1/src/base' -string_util.cc: In function 'std::string repeat(const std::string&, size_t)': -string_util.cc:199:22: error: 'ostream_iterator' is not a member of 'std' - 199 | std::fill_n(std::ostream_iterator<std::string>(os), num, input); - | ^~~~~~~~~~~~~~~~ -string_util.cc:38:1: note: 'std::ostream_iterator' is defined in header '<iterator>'; did you forget to '#include <iterator>'? - 37 | #include "string_util.hh" - +++ |+#include <iterator> - 38 | -``` - -Reason is probably the updated GNU toolchain, more info: -https://fedoraproject.org/wiki/Changes/GNUToolchainF36 - -This patch fixes the issue. ---- a/src/base/string_util.cc -+++ b/src/base/string_util.cc -@@ -29,6 +29,7 @@ - - #include "config.h" - -+#include <iterator> - #include <regex> - #include <sstream> - diff --git a/app-admin/lnav/files/lnav-0.11.0-disable-tests.patch b/app-admin/lnav/files/lnav-0.11.0-disable-tests.patch new file mode 100644 index 000000000000..8aa000d30c63 --- /dev/null +++ b/app-admin/lnav/files/lnav-0.11.0-disable-tests.patch @@ -0,0 +1,67 @@ +From 70231dce88cf47f2f3e2b396fe0623ea74eeadfc Mon Sep 17 00:00:00 2001 +From: Randy Barlow <randy@electronsweatshop.com> +Date: Sat, 3 Sep 2022 18:13:08 -0400 +Subject: [PATCH] Disable some flaky tests + +Certain tests commented out for stability reasons: + * listview: Fails when building inside sandbox + https://github.com/tstack/lnav/issues/1039 + * 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 + +Signed-off-by: Randy Barlow <randy@electronsweatshop.com> +--- + test/Makefile.am | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/test/Makefile.am b/test/Makefile.am +index fd09a656..07d6758e 100644 +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -188,10 +188,7 @@ dist_noinst_SCRIPTS = \ + test_grep_proc.sh \ + test_json_format.sh \ + test_line_buffer.sh \ +- test_listview.sh \ +- test_logfile.sh \ + test_meta.sh \ +- test_mvwattrline.sh \ + test_regex101.sh \ + test_remote.sh \ + test_scripts.sh \ +@@ -211,7 +208,6 @@ dist_noinst_SCRIPTS = \ + test_sql_xml_func.sh \ + test_sql_yaml_func.sh \ + test_text_file.sh \ +- test_tui.sh \ + test_view_colors.sh \ + test_vt52_curses.sh \ + test_pretty_print.sh +@@ -391,14 +387,11 @@ TESTS = \ + test_cmds.sh \ + test_config.sh \ + test_events.sh \ +- test_listview.sh \ + test_meta.sh \ +- test_mvwattrline.sh \ + test_grep_proc.sh \ + test_grep_proc2 \ + test_json_format.sh \ + test_log_accel \ +- test_logfile.sh \ + test_reltime \ + test_scripts.sh \ + test_sessions.sh \ +@@ -417,7 +410,6 @@ TESTS = \ + test_sql_xml_func.sh \ + test_sql_yaml_func.sh \ + test_text_file.sh \ +- test_tui.sh \ + test_data_parser.sh \ + test_pretty_print.sh \ + test_view_colors.sh \ +-- +2.37.2 + 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/files/lnav-0.8.4-disable-tests.patch b/app-admin/lnav/files/lnav-0.8.4-disable-tests.patch deleted file mode 100644 index 6b431c33b133..000000000000 --- a/app-admin/lnav/files/lnav-0.8.4-disable-tests.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- 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/files/lnav-0.9.0-bug639332-tinfow.patch b/app-admin/lnav/files/lnav-0.9.0-bug639332-tinfow.patch deleted file mode 100644 index 8399412f0cf1..000000000000 --- a/app-admin/lnav/files/lnav-0.9.0-bug639332-tinfow.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/m4/ax_with_curses.m4 2019-07-28 08:49:13.670014444 -0500 -+++ b/m4/ax_with_curses.m4 2019-07-28 08:46:32.280013473 -0500 -@@ -216,6 +216,8 @@ - ax_cv_curses=yes - ax_cv_curses_which=ncursesw - CURSES_LIB="-lncursesw" -+ temp_lib=`echo $ax_saved_LIBS|sed 's/tinfo/tinfow/'` -+ ax_saved_LIBS=$temp_lib - AC_DEFINE([HAVE_NCURSESW], [1], [Define to 1 if the NcursesW library is present]) - AC_DEFINE([HAVE_CURSES], [1], [Define to 1 if a SysV or X/Open compatible Curses library is present]) 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 deleted file mode 100644 index d2f26a436ff8..000000000000 --- a/app-admin/lnav/files/lnav-0.9.0-bug713600_0.patch +++ /dev/null @@ -1,27 +0,0 @@ -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> ---- 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 - - 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 deleted file mode 100644 index 83380fae4d8c..000000000000 --- a/app-admin/lnav/files/lnav-0.9.0-bug713600_1.patch +++ /dev/null @@ -1,23 +0,0 @@ -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> ---- 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. diff --git a/app-admin/lnav/files/lnav-0.9.0-bug786456.patch b/app-admin/lnav/files/lnav-0.9.0-bug786456.patch deleted file mode 100644 index 0d3ab64282c3..000000000000 --- a/app-admin/lnav/files/lnav-0.9.0-bug786456.patch +++ /dev/null @@ -1,551 +0,0 @@ -From e6d2e2d2b95c27cc85397d4af9528111c5304d02 Mon Sep 17 00:00:00 2001 -From: Timothy Stack <timothyshanestack@gmail.com> -Date: Sun, 30 May 2021 13:33:05 -0700 -Subject: [PATCH] [logfile] add notes for automatic decisions and fix compile - errors - -Fixes #864 - -Signed-off-by: Randy Barlow <randy@electronsweatshop.com> ---- a/m4/ax_cxx_compile_stdcxx.m4 -+++ b/m4/ax_cxx_compile_stdcxx.m4 -@@ -1,5 +1,5 @@ - # =========================================================================== --# http://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html -+# https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html - # =========================================================================== - # - # SYNOPSIS -@@ -16,7 +16,7 @@ - # The second argument, if specified, indicates whether you insist on an - # extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. - # -std=c++11). If neither is specified, you get whatever works, with --# preference for an extended mode. -+# preference for no added switch, and then for an extended mode. - # - # The third argument, if specified 'mandatory' or if left unspecified, - # indicates that baseline support for the specified C++ standard is -@@ -33,21 +33,24 @@ - # Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <sokolov@google.com> - # Copyright (c) 2015 Paul Norman <penorman@mac.com> - # Copyright (c) 2015 Moritz Klammler <moritz@klammler.eu> -+# Copyright (c) 2016, 2018 Krzesimir Nowak <qdlacz@gmail.com> -+# Copyright (c) 2019 Enji Cooper <yaneurabeya@gmail.com> -+# Copyright (c) 2020 Jason Merrill <jason@redhat.com> - # - # Copying and distribution of this file, with or without modification, are - # permitted in any medium without royalty provided the copyright notice - # and this notice are preserved. This file is offered as-is, without any - # warranty. - --#serial 4 -+#serial 12 - - dnl This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro - dnl (serial version number 13). - - AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl -- m4_if([$1], [11], [], -- [$1], [14], [], -- [$1], [17], [m4_fatal([support for C++17 not yet implemented in AX_CXX_COMPILE_STDCXX])], -+ m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"], -+ [$1], [14], [ax_cxx_compile_alternatives="14 1y"], -+ [$1], [17], [ax_cxx_compile_alternatives="17 1z"], - [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl - m4_if([$2], [], [], - [$2], [ext], [], -@@ -59,18 +62,21 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl - [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])]) - AC_LANG_PUSH([C++])dnl - ac_success=no -- AC_CACHE_CHECK(whether $CXX supports C++$1 features by default, -- ax_cv_cxx_compile_cxx$1, -- [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], -- [ax_cv_cxx_compile_cxx$1=yes], -- [ax_cv_cxx_compile_cxx$1=no])]) -- if test x$ax_cv_cxx_compile_cxx$1 = xyes; then -- ac_success=yes -- fi -+ -+ m4_if([$2], [], [dnl -+ AC_CACHE_CHECK(whether $CXX supports C++$1 features by default, -+ ax_cv_cxx_compile_cxx$1, -+ [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], -+ [ax_cv_cxx_compile_cxx$1=yes], -+ [ax_cv_cxx_compile_cxx$1=no])]) -+ if test x$ax_cv_cxx_compile_cxx$1 = xyes; then -+ ac_success=yes -+ fi]) - - m4_if([$2], [noext], [], [dnl - if test x$ac_success = xno; then -- for switch in -std=gnu++$1 -std=gnu++0x; do -+ for alternative in ${ax_cxx_compile_alternatives}; do -+ switch="-std=gnu++${alternative}" - cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) - AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, - $cachevar, -@@ -96,22 +102,27 @@ AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl - dnl HP's aCC needs +std=c++11 according to: - dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf - dnl Cray's crayCC needs "-h std=c++11" -- for switch in -std=c++$1 -std=c++0x +std=c++$1 "-h std=c++$1"; do -- cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) -- AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, -- $cachevar, -- [ac_save_CXX="$CXX" -- CXX="$CXX $switch" -- AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], -- [eval $cachevar=yes], -- [eval $cachevar=no]) -- CXX="$ac_save_CXX"]) -- if eval test x\$$cachevar = xyes; then -- CXX="$CXX $switch" -- if test -n "$CXXCPP" ; then -- CXXCPP="$CXXCPP $switch" -+ for alternative in ${ax_cxx_compile_alternatives}; do -+ for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do -+ cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) -+ AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, -+ $cachevar, -+ [ac_save_CXX="$CXX" -+ CXX="$CXX $switch" -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], -+ [eval $cachevar=yes], -+ [eval $cachevar=no]) -+ CXX="$ac_save_CXX"]) -+ if eval test x\$$cachevar = xyes; then -+ CXX="$CXX $switch" -+ if test -n "$CXXCPP" ; then -+ CXXCPP="$CXXCPP $switch" -+ fi -+ ac_success=yes -+ break - fi -- ac_success=yes -+ done -+ if test x$ac_success = xyes; then - break - fi - done -@@ -148,6 +159,11 @@ m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14], - _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 - ) - -+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17], -+ _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 -+ _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 -+ _AX_CXX_COMPILE_STDCXX_testbody_new_in_17 -+) - - dnl Tests for new features in C++11 - -@@ -185,11 +201,13 @@ namespace cxx11 - - struct Base - { -+ virtual ~Base() {} - virtual void f() {} - }; - - struct Derived : public Base - { -+ virtual ~Derived() override {} - virtual void f() override {} - }; - -@@ -518,7 +536,7 @@ namespace cxx14 - - } - -- namespace test_digit_seperators -+ namespace test_digit_separators - { - - constexpr auto ten_million = 100'000'000; -@@ -560,3 +578,385 @@ namespace cxx14 - #endif // __cplusplus >= 201402L - - ]]) -+ -+ -+dnl Tests for new features in C++17 -+ -+m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_17], [[ -+ -+// If the compiler admits that it is not ready for C++17, why torture it? -+// Hopefully, this will speed up the test. -+ -+#ifndef __cplusplus -+ -+#error "This is not a C++ compiler" -+ -+#elif __cplusplus < 201703L -+ -+#error "This is not a C++17 compiler" -+ -+#else -+ -+#include <initializer_list> -+#include <utility> -+#include <type_traits> -+ -+namespace cxx17 -+{ -+ -+ namespace test_constexpr_lambdas -+ { -+ -+ constexpr int foo = [](){return 42;}(); -+ -+ } -+ -+ namespace test::nested_namespace::definitions -+ { -+ -+ } -+ -+ namespace test_fold_expression -+ { -+ -+ template<typename... Args> -+ int multiply(Args... args) -+ { -+ return (args * ... * 1); -+ } -+ -+ template<typename... Args> -+ bool all(Args... args) -+ { -+ return (args && ...); -+ } -+ -+ } -+ -+ namespace test_extended_static_assert -+ { -+ -+ static_assert (true); -+ -+ } -+ -+ namespace test_auto_brace_init_list -+ { -+ -+ auto foo = {5}; -+ auto bar {5}; -+ -+ static_assert(std::is_same<std::initializer_list<int>, decltype(foo)>::value); -+ static_assert(std::is_same<int, decltype(bar)>::value); -+ } -+ -+ namespace test_typename_in_template_template_parameter -+ { -+ -+ template<template<typename> typename X> struct D; -+ -+ } -+ -+ namespace test_fallthrough_nodiscard_maybe_unused_attributes -+ { -+ -+ int f1() -+ { -+ return 42; -+ } -+ -+ [[nodiscard]] int f2() -+ { -+ [[maybe_unused]] auto unused = f1(); -+ -+ switch (f1()) -+ { -+ case 17: -+ f1(); -+ [[fallthrough]]; -+ case 42: -+ f1(); -+ } -+ return f1(); -+ } -+ -+ } -+ -+ namespace test_extended_aggregate_initialization -+ { -+ -+ struct base1 -+ { -+ int b1, b2 = 42; -+ }; -+ -+ struct base2 -+ { -+ base2() { -+ b3 = 42; -+ } -+ int b3; -+ }; -+ -+ struct derived : base1, base2 -+ { -+ int d; -+ }; -+ -+ derived d1 {{1, 2}, {}, 4}; // full initialization -+ derived d2 {{}, {}, 4}; // value-initialized bases -+ -+ } -+ -+ namespace test_general_range_based_for_loop -+ { -+ -+ struct iter -+ { -+ int i; -+ -+ int& operator* () -+ { -+ return i; -+ } -+ -+ const int& operator* () const -+ { -+ return i; -+ } -+ -+ iter& operator++() -+ { -+ ++i; -+ return *this; -+ } -+ }; -+ -+ struct sentinel -+ { -+ int i; -+ }; -+ -+ bool operator== (const iter& i, const sentinel& s) -+ { -+ return i.i == s.i; -+ } -+ -+ bool operator!= (const iter& i, const sentinel& s) -+ { -+ return !(i == s); -+ } -+ -+ struct range -+ { -+ iter begin() const -+ { -+ return {0}; -+ } -+ -+ sentinel end() const -+ { -+ return {5}; -+ } -+ }; -+ -+ void f() -+ { -+ range r {}; -+ -+ for (auto i : r) -+ { -+ [[maybe_unused]] auto v = i; -+ } -+ } -+ -+ } -+ -+ namespace test_lambda_capture_asterisk_this_by_value -+ { -+ -+ struct t -+ { -+ int i; -+ int foo() -+ { -+ return [*this]() -+ { -+ return i; -+ }(); -+ } -+ }; -+ -+ } -+ -+ namespace test_enum_class_construction -+ { -+ -+ enum class byte : unsigned char -+ {}; -+ -+ byte foo {42}; -+ -+ } -+ -+ namespace test_constexpr_if -+ { -+ -+ template <bool cond> -+ int f () -+ { -+ if constexpr(cond) -+ { -+ return 13; -+ } -+ else -+ { -+ return 42; -+ } -+ } -+ -+ } -+ -+ namespace test_selection_statement_with_initializer -+ { -+ -+ int f() -+ { -+ return 13; -+ } -+ -+ int f2() -+ { -+ if (auto i = f(); i > 0) -+ { -+ return 3; -+ } -+ -+ switch (auto i = f(); i + 4) -+ { -+ case 17: -+ return 2; -+ -+ default: -+ return 1; -+ } -+ } -+ -+ } -+ -+ namespace test_template_argument_deduction_for_class_templates -+ { -+ -+ template <typename T1, typename T2> -+ struct pair -+ { -+ pair (T1 p1, T2 p2) -+ : m1 {p1}, -+ m2 {p2} -+ {} -+ -+ T1 m1; -+ T2 m2; -+ }; -+ -+ void f() -+ { -+ [[maybe_unused]] auto p = pair{13, 42u}; -+ } -+ -+ } -+ -+ namespace test_non_type_auto_template_parameters -+ { -+ -+ template <auto n> -+ struct B -+ {}; -+ -+ B<5> b1; -+ B<'a'> b2; -+ -+ } -+ -+ namespace test_structured_bindings -+ { -+ -+ int arr[2] = { 1, 2 }; -+ std::pair<int, int> pr = { 1, 2 }; -+ -+ auto f1() -> int(&)[2] -+ { -+ return arr; -+ } -+ -+ auto f2() -> std::pair<int, int>& -+ { -+ return pr; -+ } -+ -+ struct S -+ { -+ int x1 : 2; -+ volatile double y1; -+ }; -+ -+ S f3() -+ { -+ return {}; -+ } -+ -+ auto [ x1, y1 ] = f1(); -+ auto& [ xr1, yr1 ] = f1(); -+ auto [ x2, y2 ] = f2(); -+ auto& [ xr2, yr2 ] = f2(); -+ const auto [ x3, y3 ] = f3(); -+ -+ } -+ -+ namespace test_exception_spec_type_system -+ { -+ -+ struct Good {}; -+ struct Bad {}; -+ -+ void g1() noexcept; -+ void g2(); -+ -+ template<typename T> -+ Bad -+ f(T*, T*); -+ -+ template<typename T1, typename T2> -+ Good -+ f(T1*, T2*); -+ -+ static_assert (std::is_same_v<Good, decltype(f(g1, g2))>); -+ -+ } -+ -+ namespace test_inline_variables -+ { -+ -+ template<class T> void f(T) -+ {} -+ -+ template<class T> inline T g(T) -+ { -+ return T{}; -+ } -+ -+ template<> inline void f<>(int) -+ {} -+ -+ template<> int g<>(int) -+ { -+ return 5; -+ } -+ -+ } -+ -+} // namespace cxx17 -+ -+#endif // __cplusplus < 201703L -+ -+]]) diff --git a/app-admin/lnav/files/lnav-0.9.0-bug792582.patch b/app-admin/lnav/files/lnav-0.9.0-bug792582.patch deleted file mode 100644 index 125f86b57a6e..000000000000 --- a/app-admin/lnav/files/lnav-0.9.0-bug792582.patch +++ /dev/null @@ -1,82 +0,0 @@ -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> ---- 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); - ---- 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; ---- 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); - diff --git a/app-admin/lnav/lnav-0.10.0-r1.ebuild b/app-admin/lnav/lnav-0.10.0-r1.ebuild deleted file mode 100644 index 50823da7ecce..000000000000 --- a/app-admin/lnav/lnav-0.10.0-r1.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# 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= - app-arch/libarchive:= - >=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) -} diff --git a/app-admin/lnav/lnav-0.10.0-r2.ebuild b/app-admin/lnav/lnav-0.10.0-r2.ebuild deleted file mode 100644 index e3da36aee5c5..000000000000 --- a/app-admin/lnav/lnav-0.10.0-r2.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# 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 test" -RESTRICT="!test? ( test )" - -RDEPEND=" - app-arch/bzip2:0= - app-arch/libarchive:= - test? ( dev-cpp/doctest ) - >=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 - # This allows us to use the --with-system-doctest configure flag, and should not be needed in - # the next release of lnav. See https://github.com/tstack/lnav/pull/915 - # This patch isn't completely identical to the one in PR #915 because that patch was too large - # for repoman's tastes. See the comment in src_prepare() for how I applied the rest of this - # patch with rm and a heredoc. - # https://bugs.gentoo.org/812353 - "${FILESDIR}"/${PN}-0.10.0-use-system-doctest.patch -) - -src_prepare() { - # repoman didn't like having a ~500 kiB patch file, so I'm just manually removing the doctest we - # don't want (the bundled one) and putting the one we do want here. - # We won't need this once we get rid of lnav-0.10.0-use-system-doctest.patch - cat <<EOF > src/doctest.hh -#include "config.h" -#include DOCTEST_HEADER -EOF - # We won't need this once we get rid of lnav-0.10.0-use-system-doctest.patch - touch src/doctest_vendored.hh - default - eautoreconf -} - -src_configure() { - econf \ - --disable-static \ - $(use_with test system-doctest) \ - $(use_with unicode ncursesw) -} diff --git a/app-admin/lnav/lnav-0.11.1-r2.ebuild b/app-admin/lnav/lnav-0.11.1-r2.ebuild new file mode 100644 index 000000000000..18fee38a20e9 --- /dev/null +++ b/app-admin/lnav/lnav-0.11.1-r2.ebuild @@ -0,0 +1,55 @@ +# 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) +} diff --git a/app-admin/lnav/lnav-0.10.1.ebuild b/app-admin/lnav/lnav-0.11.2.ebuild index efa86cff1cf6..1545017c774c 100644 --- a/app-admin/lnav/lnav-0.10.1.ebuild +++ b/app-admin/lnav/lnav-0.11.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -inherit autotools +inherit autotools flag-o-matic DESCRIPTION="A curses-based tool for viewing and analyzing log files" HOMEPAGE="https://lnav.org" @@ -12,40 +12,43 @@ SRC_URI="https://github.com/tstack/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P} LICENSE="BSD-2" SLOT="0" KEYWORDS="amd64 x86" -IUSE="unicode test" +IUSE="pcap test" RESTRICT="!test? ( test )" RDEPEND=" app-arch/bzip2:0= app-arch/libarchive:= >=dev-db/sqlite-3.9.0 - dev-libs/libpcre[cxx] + dev-libs/libpcre2 >=net-misc/curl-7.23.0 - sys-libs/ncurses:=[unicode(+)?] - sys-libs/readline:0= - sys-libs/zlib: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? ( dev-cpp/doctest )" + test? ( + virtual/openssh[ssl] + dev-cpp/doctest + )" -DOCS=( AUTHORS NEWS README ) +DOCS=( AUTHORS NEWS.md README ) PATCHES=( - "${FILESDIR}"/${PN}-0.10.0-disable-tests.patch - "${FILESDIR}"/${PN}-0.10.1-gcc12.patch + "${FILESDIR}"/${PN}-0.11.0-disable-tests.patch ) src_prepare() { default eautoreconf - - # These tests use network and expect a running sshd, so we'll just delete them. - echo "#! /bin/bash" > test/test_remote.sh || die } src_configure() { + filter-lto + econf \ --disable-static \ - $(use_with test system-doctest) \ - $(use_with unicode ncursesw) + --with-ncurses \ + $(use_with test system-doctest) } diff --git a/app-admin/lnav/lnav-0.9.0-r3.ebuild b/app-admin/lnav/lnav-0.9.0-r3.ebuild deleted file mode 100644 index 46fd2ba10a93..000000000000 --- a/app-admin/lnav/lnav-0.9.0-r3.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# 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:=[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 - # Fix a build failure on gcc - # bug 786456 - "${FILESDIR}"/${PN}-0.9.0-bug786456.patch -) - -src_prepare() { - default - eautoreconf -} - -src_configure() { - econf \ - --disable-static \ - $(use_with unicode ncursesw) -} diff --git a/app-admin/lnav/metadata.xml b/app-admin/lnav/metadata.xml index bee876353a9d..49ed98af6520 100644 --- a/app-admin/lnav/metadata.xml +++ b/app-admin/lnav/metadata.xml @@ -17,4 +17,7 @@ <upstream> <remote-id type="github">tstack/lnav</remote-id> </upstream> + <use> + <flag name="pcap">Enable support for pcap files.</flag> + </use> </pkgmetadata> |