Package: nfstrace
Followup-For: Bug #835644
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu yakkety ubuntu-patch

Hi Andrew,

I can confirm this bug, as a result of nfstrace building with -Wall -Werror
and gcc6 having new warnings.  I've verified that the warning is a false
positive, and have applied the attached patch in Ubuntu to fix the
indentation to make the compiler happy.  Please consider applying it in
Debian as well.

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slanga...@ubuntu.com                                     vor...@debian.org
diff -Nru nfstrace-0.4.2/debian/patches/gcc6-ftbfs.patch nfstrace-0.4.2/debian/patches/gcc6-ftbfs.patch
--- nfstrace-0.4.2/debian/patches/gcc6-ftbfs.patch	1969-12-31 16:00:00.000000000 -0800
+++ nfstrace-0.4.2/debian/patches/gcc6-ftbfs.patch	2016-10-04 00:17:24.000000000 -0700
@@ -0,0 +1,24 @@
+Author: Steve Langasek <steve.langa...@canonical.com>
+Description: Fix FTBFS with gcc6.
+ GCC 6 has gotten extraordinarily pedantic, to the point that -Wall -Werror
+ will fail if indentation is inconsistent.  Straighten out our indentation
+ to let GCC 6 pass.
+Bug-Debian: http://bugs.debian.org/835644
+
+Index: nfstrace-0.4.2/src/protocols/nfs/nfs_procedure.h
+===================================================================
+--- nfstrace-0.4.2.orig/src/protocols/nfs/nfs_procedure.h
++++ nfstrace-0.4.2/src/protocols/nfs/nfs_procedure.h
+@@ -109,9 +109,9 @@
+     inline ~NFSProcedure()
+     {
+         if(pres) xdr_free((xdrproc_t)proc_t_of(res), (char*)&res      );
+-                 xdr_free((xdrproc_t)xdr_replymsg,   (char*)&reply);
+-                 xdr_free((xdrproc_t)proc_t_of(arg), (char*)&arg      );
+-                 xdr_free((xdrproc_t)xdr_callmsg,    (char*)&call );
++        xdr_free((xdrproc_t)xdr_replymsg,   (char*)&reply);
++        xdr_free((xdrproc_t)proc_t_of(arg), (char*)&arg      );
++        xdr_free((xdrproc_t)xdr_callmsg,    (char*)&call );
+     }
+ 
+     // pointers to procedure specific argument and result
diff -Nru nfstrace-0.4.2/debian/patches/series nfstrace-0.4.2/debian/patches/series
--- nfstrace-0.4.2/debian/patches/series	2016-07-19 02:17:42.000000000 -0700
+++ nfstrace-0.4.2/debian/patches/series	2016-10-04 00:15:07.000000000 -0700
@@ -1 +1,2 @@
 reproducible_build.patch
+gcc6-ftbfs.patch

Reply via email to