The NMU diff is attached.
-- 
Martin Michlmayr
Linux for HP Helion, Hewlett-Packard
diff -urN a/debian/changelog b/debian/changelog
--- a/debian/changelog	2010-05-17 02:14:02.000000000 -0400
+++ b/debian/changelog	2015-07-16 11:08:50.000000000 -0400
@@ -1,3 +1,12 @@
+ipgrab (0.9.10-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix build failure with GCC 5.  Patch from Tim Potter. (Closes: #777917)
+  * Fix build failure with clang.  Patch from Arthur Marble. (Closes:
+    #739562)
+
+ -- Martin Michlmayr <t...@hp.com>  Thu, 16 Jul 2015 11:04:54 -0400
+
 ipgrab (0.9.10-1) unstable; urgency=low
 
   * New upstream release
diff -urN a/debian/patches/clang-ftbfs.patch b/debian/patches/clang-ftbfs.patch
--- a/debian/patches/clang-ftbfs.patch	1969-12-31 19:00:00.000000000 -0500
+++ b/debian/patches/clang-ftbfs.patch	2015-07-16 11:15:55.000000000 -0400
@@ -0,0 +1,14 @@
+Description: Fix build failure with clang
+Author: Arthur Marble
+
+--- ipgrab-0.9.10.orig/src/icmpv6.c
++++ ipgrab-0.9.10/src/icmpv6.c
+@@ -205,7 +205,7 @@ void dump_icmpv6(packet_t *pkt)
+     case ICMPV6_TYPE_NEIGHBORSOLICIT:
+       /* Skip 4 unused bytes */
+       if ( skip_packet_bytes (pkt,4) == 0 )
+-         return 0;
++         return;
+ 
+       /* Next 16 bytes are an IPv6 address */
+       if (get_packet_bytes((u_int8_t *) &v6addr, pkt, 16) == 0)
diff -urN a/debian/patches/series b/debian/patches/series
--- a/debian/patches/series	2010-05-17 13:33:13.000000000 -0400
+++ b/debian/patches/series	2015-07-16 11:15:48.000000000 -0400
@@ -1,2 +1,3 @@
 segfault_amd64.patch
 spelling.patch
+clang-ftbfs.patch
diff -urN a/debian/rules b/debian/rules
--- a/debian/rules	2010-05-17 01:06:56.000000000 -0400
+++ b/debian/rules	2015-07-16 11:17:55.000000000 -0400
@@ -8,6 +8,8 @@
 # This is the debhelper compatability version to use.
 #export DH_COMPAT=3
 
+export CFLAGS=-g -O2 -std=gnu89
+
 configure: configure-stamp
 configure-stamp:
 	dh_testdir

Reply via email to