Commit be81c3109da8a93cbd0f7406a444037cd9e44157 - nfstrace

+4

-7

debian/patches/build-fixes/0001-NFSProcedure-use-zero-initializers-not-memset.patch less more

6	6	src/protocols/nfs/nfs_procedure.h \| 4 ++--
7	7	1 file changed, 2 insertions(+), 2 deletions(-)
8	8
9		diff --git a/src/protocols/nfs/nfs_procedure.h b/src/protocols/nfs/nfs_procedure.h
10		index f7a2028..e3da4f2 100644
11		--- a/src/protocols/nfs/nfs_procedure.h
12		+++ b/src/protocols/nfs/nfs_procedure.h
	9	Index: nfstrace/src/protocols/nfs/nfs_procedure.h
	10	===================================================================
	11	--- nfstrace.orig/src/protocols/nfs/nfs_procedure.h
	12	+++ nfstrace/src/protocols/nfs/nfs_procedure.h
13	13	@@ -48,11 +48,11 @@ public:
14	14	inline NFSProcedure(xdr::XDRDecoder& c, xdr::XDRDecoder& r, const Session* s)
15	15	: parg{&arg} // set pointer to argument

24	24
25	25	// fill call
26	26	if(!xdr_callmsg(c.xdr(), &call))
27		--
28		2.20.1
29

+13

-16

debian/patches/build-fixes/0002-remove-meaningless-consts-Werror-ignored-qualifiers.patch less more

8	8	src/protocols/cifs/cifs.cpp \| 2 +-
9	9	3 files changed, 8 insertions(+), 8 deletions(-)
10	10
11		diff --git a/src/filtration/filtration_processor.h b/src/filtration/filtration_processor.h
12		index 8f71b53..f08c360 100644
13		--- a/src/filtration/filtration_processor.h
14		+++ b/src/filtration/filtration_processor.h
	11	Index: nfstrace/src/filtration/filtration_processor.h
	12	===================================================================
	13	--- nfstrace.orig/src/filtration/filtration_processor.h
	14	+++ nfstrace/src/filtration/filtration_processor.h
15	15	@@ -76,12 +76,12 @@ public:
16	16	{
17	17	// TODO: this code must be generalized with RPCFiltrator class

36	36	if(RPCValidator::check(reply))
37	37	{
38	38	// Truncate NFSv3 READ reply message to NFSv3-RW-limit
39		diff --git a/src/filtration/rpc_filtrator.h b/src/filtration/rpc_filtrator.h
40		index 24b494b..602ff07 100644
41		--- a/src/filtration/rpc_filtrator.h
42		+++ b/src/filtration/rpc_filtrator.h
	39	Index: nfstrace/src/filtration/rpc_filtrator.h
	40	===================================================================
	41	--- nfstrace.orig/src/filtration/rpc_filtrator.h
	42	+++ nfstrace/src/filtration/rpc_filtrator.h
43	43	@@ -80,11 +80,11 @@ public:
44	44	const MessageHeader* const msg = rm->fragment();
45	45	if(msg->type() == MsgType::REPLY)

72	72	if(RPCValidator::check(reply))
73	73	{
74	74	BaseImpl::setMsgLen(len); // length of current RPC message
75		diff --git a/src/protocols/cifs/cifs.cpp b/src/protocols/cifs/cifs.cpp
76		index 78e02a9..52a7ebf 100644
77		--- a/src/protocols/cifs/cifs.cpp
78		+++ b/src/protocols/cifs/cifs.cpp
79		@@ -57,7 +57,7 @@ const NST::protocols::CIFSv1::MessageHeader* NST::protocols::CIFSv1::get_header(
	75	Index: nfstrace/src/protocols/cifs/cifs.cpp
	76	===================================================================
	77	--- nfstrace.orig/src/protocols/cifs/cifs.cpp
	78	+++ nfstrace/src/protocols/cifs/cifs.cpp
	79	@@ -57,7 +57,7 @@ const NST::protocols::CIFSv1::MessageHea
80	80
81	81	bool MessageHeader::isFlag(const Flags flag) const
82	82	{

85	85	}
86	86
87	87	extern "C" NST_PUBLIC const char* print_cifs1_procedures(SMBv1Commands cmd_code)
88		--
89		2.20.1
90

+5

-3

debian/patches/compilation-flags.patch less more

0	0	Remove unrecognised -Wno-braced-scalar-init, add -Wno-error=address-of-packed-member until a proper fix is written
1	1
2		--- a/CMakeLists.txt
3		+++ b/CMakeLists.txt
4		@@ -30,7 +30,7 @@
	2	Index: nfstrace/CMakeLists.txt
	3	===================================================================
	4	--- nfstrace.orig/CMakeLists.txt
	5	+++ nfstrace/CMakeLists.txt
	6	@@ -30,7 +30,7 @@ if ("${PCAP_LIBRARY}" STREQUAL "PCAP_LIB
5	7	endif ()
6	8
7	9	# build application ============================================================

+4

-4

debian/patches/docs-utf8.patch less more

2	2	Subject: Fix FTBFS with TeX Live 2018
3	3	Bug-Debian: https://bugs.debian.org/896467
4	4
5		diff --git a/docs/nfstrace_manual.tex b/docs/nfstrace_manual.tex
6		index 11a3b58..77cc12a 100644
7		--- a/docs/nfstrace_manual.tex
8		+++ b/docs/nfstrace_manual.tex
	5	Index: nfstrace/docs/nfstrace_manual.tex
	6	===================================================================
	7	--- nfstrace.orig/docs/nfstrace_manual.tex
	8	+++ nfstrace/docs/nfstrace_manual.tex
9	9	@@ -7,6 +7,7 @@
10	10	\usepackage{fancyhdr}
11	11	\usepackage{verbatim}

+5

-3

debian/patches/reproducible_build.patch less more

1	1	Date: 2016-07-17 13:48:59.441176704 +0200
2	2	Subject: Build reproducibly.
3	3
4		--- a/src/controller/build_info.h.in
5		+++ b/src/controller/build_info.h.in
6		@@ -29,9 +29,7 @@
	4	Index: nfstrace/src/controller/build_info.h.in
	5	===================================================================
	6	--- nfstrace.orig/src/controller/build_info.h.in
	7	+++ nfstrace/src/controller/build_info.h.in
	8	@@ -29,9 +29,7 @@ constexpr unsigned int NST_VERSION =
7	9	@NST_V_MAJOR@ * 1000 + @NST_V_MINOR@ * 100 + @NST_V_PATCH@;
8	10
9	11	constexpr char PROGRAM_BUILD_INFO[]=

+4

-2

debian/patches/reproducible_build2.patch less more

1	1	Date: 2017-06-24 14:27:26.476641008 +0100
2	2	Subject: Make the build reproducible
3	3
4		--- nfstrace-0.4.3.1.orig/docs/nfstrace_manual.tex
5		+++ nfstrace-0.4.3.1/docs/nfstrace_manual.tex
	4	Index: nfstrace/docs/nfstrace_manual.tex
	5	===================================================================
	6	--- nfstrace.orig/docs/nfstrace_manual.tex
	7	+++ nfstrace/docs/nfstrace_manual.tex
6	8	@@ -54,7 +54,8 @@
7	9	\fancyfoot[L]{Nfstrace User and Developer Manual}% \fancyfoot[R]{\thepage}
8	10	\renewcommand{\headrulewidth}{0.4pt}% Default \headrulewidth is 0.4pt