diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 17:44:56 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-04 17:44:56 +0000 |
commit | 74d6266a7d50d0469106a99ec2fd109ae58a9afa (patch) | |
tree | bba80da0f80637f3e85362da1817d4487e36ad99 /debian/patches | |
parent | Adding upstream version 0.11.1. (diff) | |
download | lnav-debian/0.11.1-3.tar.xz lnav-debian/0.11.1-3.zip |
Adding debian version 0.11.1-3.debian/0.11.1-3debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '')
-rw-r--r-- | debian/patches/default-to-var-log-syslog-on-Debian.patch | 25 | ||||
-rw-r--r-- | debian/patches/disable-broken-test_listview.patch | 26 | ||||
-rw-r--r-- | debian/patches/disable-broken-test_logfile-test.patch | 23 | ||||
-rw-r--r-- | debian/patches/disable-test_mvwattrline.patch | 23 | ||||
-rw-r--r-- | debian/patches/disable-test_sql.patch | 30 | ||||
-rw-r--r-- | debian/patches/disable-test_vt52_curses.patch | 27 | ||||
-rw-r--r-- | debian/patches/series | 7 | ||||
-rw-r--r-- | debian/patches/test_sql_str_func.sh-Correct-expected-output-on-bad-.patch | 33 |
8 files changed, 194 insertions, 0 deletions
diff --git a/debian/patches/default-to-var-log-syslog-on-Debian.patch b/debian/patches/default-to-var-log-syslog-on-Debian.patch new file mode 100644 index 0000000..c2a5511 --- /dev/null +++ b/debian/patches/default-to-var-log-syslog-on-Debian.patch @@ -0,0 +1,25 @@ +Description: Prefer /var/log/syslog over /var/log/messages + On Debian the default /etc/rsyslog.conf shipped with rsyslog + prefers logs *.* to /var/log/syslog. Thus prefer this logfile + in list of default logfiles. +Origin: vendor +Bug-Debian: https://bugs.debian.org/721700 +Forwarded: not-needed +Author: Salvatore Bonaccorso <carnil@debian.org> +Last-Update: 2015-11-16 + +--- a/src/lnav.cc ++++ b/src/lnav.cc +@@ -2623,10 +2623,10 @@ SELECT tbl_name FROM sqlite_master WHERE + } + + if (!mode_flags.mf_check_configs && !lnav_data.ld_show_help_view) { +- DEFAULT_FILES.emplace_back("var/log/messages"); +- DEFAULT_FILES.emplace_back("var/log/system.log"); + DEFAULT_FILES.emplace_back("var/log/syslog"); + DEFAULT_FILES.emplace_back("var/log/syslog.log"); ++ DEFAULT_FILES.emplace_back("var/log/messages"); ++ DEFAULT_FILES.emplace_back("var/log/system.log"); + } + + init_lnav_commands(lnav_commands); diff --git a/debian/patches/disable-broken-test_listview.patch b/debian/patches/disable-broken-test_listview.patch new file mode 100644 index 0000000..cf8e0fe --- /dev/null +++ b/debian/patches/disable-broken-test_listview.patch @@ -0,0 +1,26 @@ +Description: Disable broken test_listview.sh test +Origin: vendor +Bug: https://github.com/tstack/lnav/issues/797 +Bug-Debian: https://bugs.debian.org/975803 +Author: Salvatore Bonaccorso <carnil@debian.org> +Last-Update: 2020-12-30 +Applied-Upstream: no + +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -391,7 +391,6 @@ TESTS = \ + test_cmds.sh \ + test_config.sh \ + test_events.sh \ +- test_listview.sh \ + test_meta.sh \ + test_grep_proc.sh \ + test_grep_proc2 \ +@@ -425,6 +424,7 @@ DISABLED_TESTS = \ + test_remote.sh \ + test_top_status \ + test_line_buffer2 \ ++ test_listview.sh \ + test_logfile.sh \ + test_line_buffer.sh \ + test_sql.sh \ diff --git a/debian/patches/disable-broken-test_logfile-test.patch b/debian/patches/disable-broken-test_logfile-test.patch new file mode 100644 index 0000000..c707fe0 --- /dev/null +++ b/debian/patches/disable-broken-test_logfile-test.patch @@ -0,0 +1,23 @@ +Description: Disable broken test_logfile.sh test +Origin: vendor +Author: Salvatore Bonaccorso <carnil@debian.org> +Last-Update: 2019-09-02 + +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -397,7 +397,6 @@ TESTS = \ + test_grep_proc2 \ + test_json_format.sh \ + test_log_accel \ +- test_logfile.sh \ + test_reltime \ + test_scripts.sh \ + test_sessions.sh \ +@@ -427,6 +426,7 @@ DISABLED_TESTS = \ + test_remote.sh \ + test_top_status \ + test_line_buffer2 \ ++ test_logfile.sh \ + test_line_buffer.sh \ + test_vt52_curses.sh + diff --git a/debian/patches/disable-test_mvwattrline.patch b/debian/patches/disable-test_mvwattrline.patch new file mode 100644 index 0000000..1f1dbd1 --- /dev/null +++ b/debian/patches/disable-test_mvwattrline.patch @@ -0,0 +1,23 @@ +Description: Disable test_mvwattrline test +Origin: vendor +Forwarded: no +Author: Salvatore Bonaccorso <carnil@debian.org> + +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -393,7 +393,6 @@ TESTS = \ + test_events.sh \ + test_listview.sh \ + test_meta.sh \ +- test_mvwattrline.sh \ + test_grep_proc.sh \ + test_grep_proc2 \ + test_json_format.sh \ +@@ -424,6 +423,7 @@ TESTS = \ + test_vt52_curses.sh + + DISABLED_TESTS = \ ++ test_mvwattrline \ + test_regex101.sh \ + test_remote.sh \ + test_top_status \ diff --git a/debian/patches/disable-test_sql.patch b/debian/patches/disable-test_sql.patch new file mode 100644 index 0000000..26270a9 --- /dev/null +++ b/debian/patches/disable-test_sql.patch @@ -0,0 +1,30 @@ +Description: Disable test_sql completely as contains time dependent tests + Disable test_sql tests as they contain a time dependent component + which caused a FTBFS starting in 2019-01-01. + . + Although this was addressed upstream in the concrete case it will + not suffice for the complete lifetime of buster. +Origin: vendor +Bug-Debian: https://bugs.debian.org/918153 +Forwarded: no +Author: Salvatore Bonaccorso <carnil@debian.org> +Last-Update: 2019-09-02 + +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -401,7 +401,6 @@ TESTS = \ + test_scripts.sh \ + test_sessions.sh \ + test_shlexer.sh \ +- test_sql.sh \ + test_sql_anno.sh \ + test_sql_coll_func.sh \ + test_sql_fs_func.sh \ +@@ -428,6 +427,7 @@ DISABLED_TESTS = \ + test_line_buffer2 \ + test_logfile.sh \ + test_line_buffer.sh \ ++ test_sql.sh \ + test_vt52_curses.sh + + if HAVE_LIBCURL diff --git a/debian/patches/disable-test_vt52_curses.patch b/debian/patches/disable-test_vt52_curses.patch new file mode 100644 index 0000000..dc2c9ca --- /dev/null +++ b/debian/patches/disable-test_vt52_curses.patch @@ -0,0 +1,27 @@ +Description: Disable failing test_vt52_curses test +Origin: vendor +Forwarded: no +Author: Salvatore Bonaccorso <carnil@debian.org> + +--- a/test/Makefile.am ++++ b/test/Makefile.am +@@ -419,8 +419,7 @@ TESTS = \ + test_tui.sh \ + test_data_parser.sh \ + test_pretty_print.sh \ +- test_view_colors.sh \ +- test_vt52_curses.sh ++ test_view_colors.sh + + DISABLED_TESTS = \ + test_mvwattrline \ +@@ -428,7 +427,8 @@ DISABLED_TESTS = \ + test_remote.sh \ + test_top_status \ + test_line_buffer2 \ +- test_line_buffer.sh ++ test_line_buffer.sh \ ++ test_vt52_curses.sh + + if HAVE_LIBCURL + TESTS += \ diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..d0bedd6 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,7 @@ +default-to-var-log-syslog-on-Debian.patch +disable-test_mvwattrline.patch +disable-test_vt52_curses.patch +disable-broken-test_logfile-test.patch +disable-test_sql.patch +disable-broken-test_listview.patch +test_sql_str_func.sh-Correct-expected-output-on-bad-.patch diff --git a/debian/patches/test_sql_str_func.sh-Correct-expected-output-on-bad-.patch b/debian/patches/test_sql_str_func.sh-Correct-expected-output-on-bad-.patch new file mode 100644 index 0000000..895bafb --- /dev/null +++ b/debian/patches/test_sql_str_func.sh-Correct-expected-output-on-bad-.patch @@ -0,0 +1,33 @@ +From 8b511514851901cb29ebf3fb96b626bffe37292d Mon Sep 17 00:00:00 2001 +From: Salvatore Bonaccorso <carnil@debian.org> +Date: Fri, 31 Mar 2023 15:51:13 +0200 +Subject: [PATCH] test_sql_str_func.sh: Correct expected output on bad IPv6 + address + +The test checks https://bad@[fe:: which since curl 7.88.1 reports back +"Bad IPv6 address" (CURLUE_BAD_IPV6). Previously it reported back "Port +number was not a decimal number between 0 and 65535" +(CURLUE_BAD_PORT_NUMBER). + +Curl upstream changed in +https://github.com/curl/curl/commit/8b27799f8c5e51187533edb04c66dd9079e1c478 +the port number function extraction, as the port number function does +not need to fully verify the IPv6 address. + +Fixes: #1128 +Link: https://bugs.debian.org/1032539 +Signed-off-by: Salvatore Bonaccorso <carnil@debian.org> +--- + ...sql_str_func.sh_3855d2cc0ab29171cae8e722f130adec25eae36e.err | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/expected/test_sql_str_func.sh_3855d2cc0ab29171cae8e722f130adec25eae36e.err b/test/expected/test_sql_str_func.sh_3855d2cc0ab29171cae8e722f130adec25eae36e.err +index e3d40abf40a2..a7c2bb2abd74 100644 +--- a/test/expected/test_sql_str_func.sh_3855d2cc0ab29171cae8e722f130adec25eae36e.err ++++ b/test/expected/test_sql_str_func.sh_3855d2cc0ab29171cae8e722f130adec25eae36e.err +@@ -1 +1 @@ +-error: sqlite3_exec failed -- lnav-error:{"level":"error","message":{"str":"invalid URL: “https://bad@[fe::”","attrs":[]},"reason":{"str":"Port number was not a decimal number between 0 and 65535","attrs":[]},"snippets":[],"help":{"str":"","attrs":[]}} ++error: sqlite3_exec failed -- lnav-error:{"level":"error","message":{"str":"invalid URL: “https://bad@[fe::”","attrs":[]},"reason":{"str":"Bad IPv6 address","attrs":[]},"snippets":[],"help":{"str":"","attrs":[]}} +-- +2.40.0 + |