Control: tags -1 - moreinfo unreproducible Control: tags -1 + confirmed Hi
On Tue, Oct 02, 2012 at 05:04:51PM +0200, Salvatore Bonaccorso wrote: > Hi Paul > > On Sat, Sep 29, 2012 at 03:38:36PM -0400, Paul Tagliamonte wrote: > > tags 688668 + moreinfo unreproducible > > thanks > > > > Heyya! > > > > So, i've taken a look at your patch, and I'm not sure where the move was > > introduced -- do you have a kernel version this change was introduced > > in? > > > > | $ apt-file search netinet/if_tr.h > > | $ apt-file search linux/if_tr.h > > | linux-headers-3.4-trunk-common: > > /usr/src/linux-headers-3.4-trunk-common/include/linux/if_tr.h > > | linux-headers-3.4-trunk-common-rt: > > /usr/src/linux-headers-3.4-trunk-common-rt/include/linux/if_tr.h > > | linux-libc-dev: /usr/include/linux/if_tr.h > > > > Anyway, patch looks minimal, and thanks for your work! > > I did only a quick search so far. AFAICS this was done in following > git commit[1]. > > [1]: > http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=ee446fd5e6dafee4a16fd1bd345d2571dcfd6f5d And indeed with linux-libc-dev 3.5.2-1~experimental.1 from experimental the FTBFS can be reproduced. With the applied patch iptraf still builds both with linux-libc-dev from both sid and experimental. I prepared the patch with the fix submitted by Marcin but not yet uploaded to a delayed queue to wait first for comments/feedback. Regards, Salvatore
diff -u iptraf-3.0.0/debian/changelog iptraf-3.0.0/debian/changelog --- iptraf-3.0.0/debian/changelog +++ iptraf-3.0.0/debian/changelog @@ -1,3 +1,15 @@ +iptraf (3.0.0-8.1) unstable; urgency=low + + * Non-maintainer upload. + * Patched to use netinet/if_tr.h instead of linux/if_tr.h. + Linux kernel dropped tokenring if_tr.h headers in upstream commit + ee446fd5e6dafee4a16fd1bd345d2571dcfd6f5d. Use netinet/if_tr.h instead + of linux/if_tr.h to fix FTBFS with recent kernels. + Thanks to Marcin Juszkiewicz <marcin.juszkiew...@linaro.org> + (Closes: #688668) + + -- Salvatore Bonaccorso <car...@debian.org> Wed, 03 Oct 2012 11:56:19 +0200 + iptraf (3.0.0-8) unstable; urgency=low * src/ifaces.c: fix strcpy bug (patch by Thomas Themel) (closes: #590526) diff -u iptraf-3.0.0/src/packet.c iptraf-3.0.0/src/packet.c --- iptraf-3.0.0/src/packet.c +++ iptraf-3.0.0/src/packet.c @@ -36,7 +36,7 @@ #include <linux/if_packet.h> #include <linux/if_ether.h> #include <linux/if_fddi.h> -#include <linux/if_tr.h> +#include <netinet/if_tr.h> #include <linux/sockios.h> #include <msgboxes.h> #include "deskman.h" diff -u iptraf-3.0.0/src/tcptable.h iptraf-3.0.0/src/tcptable.h --- iptraf-3.0.0/src/tcptable.h +++ iptraf-3.0.0/src/tcptable.h @@ -22,7 +22,7 @@ #include <linux/if_packet.h> #include <linux/if_ether.h> #include <linux/if_fddi.h> -#include <linux/if_tr.h> +#include <netinet/if_tr.h> #include <netinet/ip.h> #include <netinet/udp.h> #include "servname.h" diff -u iptraf-3.0.0/src/othptab.c iptraf-3.0.0/src/othptab.c --- iptraf-3.0.0/src/othptab.c +++ iptraf-3.0.0/src/othptab.c @@ -32,7 +32,7 @@ /*#include <linux/socket.h>*/ #include <linux/if.h> #include <linux/if_ether.h> -#include <linux/if_tr.h> +#include <netinet/if_tr.h> #include <linux/if_fddi.h> #include <linux/if_arp.h> #include <netdb.h> diff -u iptraf-3.0.0/src/hostmon.c iptraf-3.0.0/src/hostmon.c --- iptraf-3.0.0/src/hostmon.c +++ iptraf-3.0.0/src/hostmon.c @@ -31,7 +31,7 @@ #include <linux/if_packet.h> #include <linux/if_ether.h> #include <linux/if_fddi.h> -#include <linux/if_tr.h> +#include <netinet/if_tr.h> #include <net/if_arp.h> #include <stdlib.h> #include <time.h>
signature.asc
Description: Digital signature
