control: tags -1 patch pending
The attached debdiff from Ubuntu is going in.
G.
diff -Nru nfstrace-0.4.3.2+git20200805+b220d04/debian/changelog
nfstrace-0.4.3.2+git20200805+b220d04/debian/changelog
--- nfstrace-0.4.3.2+git20200805+b220d04/debian/changelog 2021-08-26
06:08:31.000000000 -0400
+++ nfstrace-0.4.3.2+git20200805+b220d04/debian/changelog 2022-03-17
13:21:02.000000000 -0400
@@ -1,3 +1,11 @@
+nfstrace (0.4.3.2+git20200805+b220d04-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * debian/patches/0001-analyzers-fix-a-couple-format-errors.patch: Fix
+ -Werror=format build errors (LP: #1965155, Closes: #997231).
+
+ -- Nick Rosbrook <nick.rosbr...@canonical.com> Thu, 17 Mar 2022 13:21:02
-0400
+
nfstrace (0.4.3.2+git20200805+b220d04-2) unstable; urgency=medium
[ Aurelien Jarno ]
diff -Nru
nfstrace-0.4.3.2+git20200805+b220d04/debian/patches/0001-analyzers-fix-a-couple-format-errors.patch
nfstrace-0.4.3.2+git20200805+b220d04/debian/patches/0001-analyzers-fix-a-couple-format-errors.patch
---
nfstrace-0.4.3.2+git20200805+b220d04/debian/patches/0001-analyzers-fix-a-couple-format-errors.patch
1969-12-31 19:00:00.000000000 -0500
+++
nfstrace-0.4.3.2+git20200805+b220d04/debian/patches/0001-analyzers-fix-a-couple-format-errors.patch
2022-03-16 12:08:15.000000000 -0400
@@ -0,0 +1,45 @@
+Description: Fix -Werror=format build errors
+Author: Nick Rosbrook <nick.rosbr...@canonical.com>
+Forwarded: https://github.com/epam/nfstrace/pull/51
+Last-Update: 2022-03-16
+---
+From af1472cfd88a724e7208e0c2534a47d7f40ff2ab Mon Sep 17 00:00:00 2001
+From: Nick Rosbrook <nick.rosbr...@canonical.com>
+Date: Wed, 16 Mar 2022 11:31:00 -0400
+Subject: [PATCH] analyzers: fix a couple format errors
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+A couple mvwprintw() calls result in build errors like:
+
+error: format ‘%d’ expects argument of type ‘int’, but argument 5 has type
‘time_t’ {aka ‘long int’} [-Werror=format=]
+
+Update these calls to use the correct format specifiers.
+---
+ analyzers/src/watch/nc_windows/header_window.cpp | 2 +-
+ analyzers/src/watch/nc_windows/statistics_window.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/analyzers/src/watch/nc_windows/header_window.cpp
++++ b/analyzers/src/watch/nc_windows/header_window.cpp
+@@ -74,7 +74,7 @@
+ time_t shift_time = actual_time - _start_time;
+ /* tm starts with 0 month and 1900 year*/
+ mvwprintw(_window, HEADER::DATE_LINE, FIRST_CHAR_POS, "Date: \t %d.%d.%d
\t Time: %d:%d:%d ", t->tm_mday, t->tm_mon + 1, t->tm_year + 1900, t->tm_hour,
t->tm_min, t->tm_sec);
+- mvwprintw(_window, HEADER::ELAPSED_LINE, FIRST_CHAR_POS, "Elapsed time:
\t %d days; %d:%d:%d times",
++ mvwprintw(_window, HEADER::ELAPSED_LINE, FIRST_CHAR_POS, "Elapsed time:
\t %ld days; %ld:%ld:%ld times",
+ shift_time / SECINDAY, shift_time % SECINDAY / SECINHOUR,
shift_time % SECINHOUR / SECINMIN, shift_time % SECINMIN);
+ wrefresh(_window);
+ }
+--- a/analyzers/src/watch/nc_windows/statistics_window.cpp
++++ b/analyzers/src/watch/nc_windows/statistics_window.cpp
+@@ -153,7 +153,7 @@
+ }
+ if(canWrite(line))
+ {
+- mvwprintw(_window, line - (_scrollOffset.at(_activeProtocol)),
FIRST_CHAR_POS + 25, "%d", m);
++ mvwprintw(_window, line - (_scrollOffset.at(_activeProtocol)),
FIRST_CHAR_POS + 25, "%ld", m);
+ }
+ line++;
+ for(unsigned int j = _activeProtocol->getGroupBegin(i); j <
_activeProtocol->getGroupBegin(i + 1); j++)
diff -Nru nfstrace-0.4.3.2+git20200805+b220d04/debian/patches/series
nfstrace-0.4.3.2+git20200805+b220d04/debian/patches/series
--- nfstrace-0.4.3.2+git20200805+b220d04/debian/patches/series 2021-08-26
06:08:31.000000000 -0400
+++ nfstrace-0.4.3.2+git20200805+b220d04/debian/patches/series 2022-03-16
11:59:13.000000000 -0400
@@ -1 +1,2 @@
+0001-analyzers-fix-a-couple-format-errors.patch
tirpc.patch
