[Pkg-vsquare-changes] r281 - in lwipv6/trunk/debian: . patches

[Ludovico Gardenghi]

Author: garden
Date: 2012-01-20 11:48:50 +0000 (Fri, 20 Jan 2012)
New Revision: 281

Added:
   lwipv6/trunk/debian/patches/use_arpa_inet_h_for_network_byte_order.patch
Modified:
   lwipv6/trunk/debian/changelog
   lwipv6/trunk/debian/patches/series
Log:
* Add patch for using arpa/inet.h for htonl... functions.
* Prepare to release 1.5a-2.



Modified: lwipv6/trunk/debian/changelog
===================================================================
--- lwipv6/trunk/debian/changelog	2012-01-20 00:09:03 UTC (rev 280)
+++ lwipv6/trunk/debian/changelog	2012-01-20 11:48:50 UTC (rev 281)
@@ -1,3 +1,11 @@
+lwipv6 (1.5a-2) unstable; urgency=low
+
+  * Add patch use_arpa_inet_h_for_network_byte_order.patch: don't play with
+    #define and htonl et al. for trying to optimise, leave arpa/inet.h do the
+    job. Fix FTBFS on big endian architectures.
+
+ -- Ludovico Gardenghi <garden at debian.org>  Fri, 20 Jan 2012 12:18:37 +0100
+
 lwipv6 (1.5a-1) unstable; urgency=low
 
   * New upstream release

Modified: lwipv6/trunk/debian/patches/series
===================================================================
--- lwipv6/trunk/debian/patches/series	2012-01-20 00:09:03 UTC (rev 280)
+++ lwipv6/trunk/debian/patches/series	2012-01-20 11:48:50 UTC (rev 281)
@@ -1,2 +1,3 @@
 check_and_use_libdl.patch
 fix_soname_version_info.patch
+use_arpa_inet_h_for_network_byte_order.patch

Added: lwipv6/trunk/debian/patches/use_arpa_inet_h_for_network_byte_order.patch
===================================================================
--- lwipv6/trunk/debian/patches/use_arpa_inet_h_for_network_byte_order.patch	                        (rev 0)
+++ lwipv6/trunk/debian/patches/use_arpa_inet_h_for_network_byte_order.patch	2012-01-20 11:48:50 UTC (rev 281)
@@ -0,0 +1,35 @@
+Index: lwipv6-1.5a/lwip-v6/src/include/ipv6/lwip/inet.h
+===================================================================
+--- lwipv6-1.5a.orig/lwip-v6/src/include/ipv6/lwip/inet.h	2012-01-20 12:18:01.034349951 +0100
++++ lwipv6-1.5a/lwip-v6/src/include/ipv6/lwip/inet.h	2012-01-20 12:18:20.327683691 +0100
+@@ -52,6 +52,8 @@
+ #ifndef __LWIP_INET_H__
+ #define __LWIP_INET_H__
+ 
++#include <arpa/inet.h>
++
+ #include "lwip/arch.h"
+ 
+ #include "lwip/opt.h"
+@@ -80,21 +82,6 @@
+ 
+ /*--------------------------------------------------------------------*/
+ 
+-#ifndef htons
+-
+-#if BYTE_ORDER == BIG_ENDIAN
+-#define htons(x) (x)
+-#define ntohs(x) (x)
+-#define htonl(x) (x)
+-#define ntohl(x) (x)
+-#else
+-u16_t htons(u16_t x);
+-u16_t ntohs(u16_t x);
+-u32_t htonl(u32_t x);
+-u32_t ntohl(u32_t x);
+-#endif /* BYTE_ORDER == LITTLE_ENDIAN */
+-
+-#endif
+ #endif /* __LWIP_INET_H__ */
+ 
+