Bug#443632: FTBFS: Does not use BSD 'struct tcphdr' definition

[Cyril Brulebois]

tag 443632 patch pending
thanks

Matt Kraai <[EMAIL PROTECTED]> (22/09/2007):
> cheops fails to build because it does not use the BSD struct tcphdr
> definition:
> […]
> The attached patch fixes this by defining __FAVOR_BSD immediately
> before including netinet/tcp.h, as suggested by the Wikipedia entry:

Thanks for the report and the patch. Uploaded in an NMU to DELAYED/2.
Please find the nmudiff attached.

Cheers,

-- 
Cyril Brulebois

diff -u cheops-0.61/debian/changelog cheops-0.61/debian/changelog
--- cheops-0.61/debian/changelog
+++ cheops-0.61/debian/changelog
@@ -1,3 +1,12 @@
+cheops (0.61-15.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Use “#define __FAVOR_BSD” in tcpip-mod.c to use the BSD struct tcphdr
+    definition, as suggested by Matt Kraai (Closes: #443632).
+  * Move the DH_COMPAT definition from debian/rules to debian/compat.
+
+ -- Cyril Brulebois <[EMAIL PROTECTED]>  Sun, 30 Sep 2007 03:14:58 +0200
+
 cheops (0.61-15) unstable; urgency=low
 
   * Use printf instead of echo to properly fix build error when
diff -u cheops-0.61/debian/rules cheops-0.61/debian/rules
--- cheops-0.61/debian/rules
+++ cheops-0.61/debian/rules
@@ -6,7 +6,6 @@
 #export DH_VERBOSE=1
 
 # This is the debhelper compatability version to use.
-export DH_COMPAT=4
 
 build: build-stamp
 build-stamp:
diff -u cheops-0.61/tcpip-mod.c cheops-0.61/tcpip-mod.c
--- cheops-0.61/tcpip-mod.c
+++ cheops-0.61/tcpip-mod.c
@@ -10,6 +10,7 @@
 #include <sys/socket.h>
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
+#define __FAVOR_BSD
 #include <netinet/tcp.h>
 #include <netinet/ip.h>
 #include <netinet/ip_icmp.h>
only in patch2:
unchanged:
--- cheops-0.61.orig/debian/compat
+++ cheops-0.61/debian/compat
@@ -0,0 +1 @@
+4

pgpPcxYhxwgvf.pgp
Description: PGP signature