Hello,
attached updated debdiff with some more fixes on 32 bit archs and with some
compiler optimization options.
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 2022-03-17
18:21:02.000000000 +0100
+++ nfstrace-0.4.3.2+git20200805+b220d04/debian/changelog 2022-03-18
14:47:25.000000000 +0100
@@ -1,3 +1,14 @@
+nfstrace (0.4.3.2+git20200805+b220d04-2.2) unstable; urgency=medium
+
+ * Non-maintainer upload
+ * debian/patches/0001-analyzers-fix-a-couple-format-errors.patch: Refresh to
+ address format errors on armhf.
+ * debian/patches/debian/patches/watch-analyzer-fix-array-bound-error.patch:
+ Take the relevant parts of an upstream patch to fix an array bound build
+ error.
+
+ -- Nick Rosbrook <nick.rosbr...@canonical.com> Fri, 18 Mar 2022 09:47:25
-0400
+
nfstrace (0.4.3.2+git20200805+b220d04-2.1) unstable; urgency=medium
* Non-maintainer upload
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
2022-03-17 18:21:02.000000000 +0100
+++
nfstrace-0.4.3.2+git20200805+b220d04/debian/patches/0001-analyzers-fix-a-couple-format-errors.patch
2022-03-18 14:47:25.000000000 +0100
@@ -1,26 +1,8 @@
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
+Last-Update: 2022-03-18
---
-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 @@
@@ -34,12 +16,20 @@
}
--- a/analyzers/src/watch/nc_windows/statistics_window.cpp
+++ b/analyzers/src/watch/nc_windows/statistics_window.cpp
-@@ -153,7 +153,7 @@
+@@ -153,14 +153,14 @@
}
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);
++ mvwprintw(_window, line - (_scrollOffset.at(_activeProtocol)),
FIRST_CHAR_POS + 25, "%zu", m);
}
line++;
for(unsigned int j = _activeProtocol->getGroupBegin(i); j <
_activeProtocol->getGroupBegin(i + 1); j++)
+ {
+ if(canWrite(line))
+ {
+- mvwprintw(_window, line - _scrollOffset.at(_activeProtocol),
COUNTERS_POS, "%lu ", _statistic[j]);
++ mvwprintw(_window, line - _scrollOffset.at(_activeProtocol),
COUNTERS_POS, "%lu ", static_cast<long unsigned int>(_statistic[j]));
+ mvwprintw(_window, line - _scrollOffset.at(_activeProtocol),
PERSENT_POS, "%-3.2f%% ",
+ m > 0 ? static_cast<double>(_statistic[j]) /
static_cast<double>(m) * 100.0 : 0.0);
+ }
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 2022-03-17
18:21:02.000000000 +0100
+++ nfstrace-0.4.3.2+git20200805+b220d04/debian/patches/series 2022-03-18
14:47:25.000000000 +0100
@@ -1,2 +1,3 @@
+watch-analyzer-fix-array-bound-error.patch
0001-analyzers-fix-a-couple-format-errors.patch
tirpc.patch
diff -Nru
nfstrace-0.4.3.2+git20200805+b220d04/debian/patches/watch-analyzer-fix-array-bound-error.patch
nfstrace-0.4.3.2+git20200805+b220d04/debian/patches/watch-analyzer-fix-array-bound-error.patch
---
nfstrace-0.4.3.2+git20200805+b220d04/debian/patches/watch-analyzer-fix-array-bound-error.patch
1970-01-01 01:00:00.000000000 +0100
+++
nfstrace-0.4.3.2+git20200805+b220d04/debian/patches/watch-analyzer-fix-array-bound-error.patch
2022-03-18 14:47:25.000000000 +0100
@@ -0,0 +1,23 @@
+Description: Fix array bound issue in watch analyzer
+Origin: upstream,
https://github.com/epam/nfstrace/commit/849a019505103d65147c3d8e4e79df260df75ff6
+Last-Update: 2022-03-18
+--- a/analyzers/src/watch/watch_analyzer.cpp
++++ b/analyzers/src/watch/watch_analyzer.cpp
+@@ -234,7 +234,7 @@
+ const struct
NFS4::GET_DIR_DELEGATION4args*,
+ const struct
NFS4::GET_DIR_DELEGATION4res* res) { if (res) { account40_op(proc,
ProcEnumNFS4::NFSProcedure::GET_DIR_DELEGATION); } }
+ void WatchAnalyzer::illegal40(const RPCProcedure* proc,
+- const struct NFS4::ILLEGAL4res* res) { if (res)
{ account40_op(proc, ProcEnumNFS4::NFSProcedure::ILLEGAL); } }
++ const struct NFS4::ILLEGAL4res* res) { if (res)
{ account40_op(proc, /*ProcEnumNFS4::NFSProcedure::ILLEGAL is mapped to 2
index*/ static_cast<ProcEnumNFS4::NFSProcedure>(2)); } }
+
+ // NFSv4.1 procedures
+
+@@ -406,7 +406,7 @@
+ const struct
NFS41::RECLAIM_COMPLETE4args*,
+ const struct
NFS41::RECLAIM_COMPLETE4res* res) { if (res) { account41_op(proc,
ProcEnumNFS41::NFSProcedure::RECLAIM_COMPLETE); } }
+ void WatchAnalyzer::illegal41(const RPCProcedure* proc,
+- const struct NFS41::ILLEGAL4res* res) { if
(res) { account41_op(proc, ProcEnumNFS41::NFSProcedure::ILLEGAL); } }
++ const struct NFS41::ILLEGAL4res* res) { if
(res) { account41_op(proc, /*ProcEnumNFS41::NFSProcedure::ILLEGAL is mapped to
2 index*/ static_cast<ProcEnumNFS41::NFSProcedure>(2)); } }
+ // CIFS v1
+ void WatchAnalyzer::createDirectorySMBv1(const SMBv1::CreateDirectoryCommand*
/*cmd*/, const SMBv1::CreateDirectoryArgumentType*, const
SMBv1::CreateDirectoryResultType*)
+ {
