[med-svn] r15652 - in trunk/packages/socket++/trunk/debian: . patches

[Mathieu Malaterre]

Author: malat
Date: 2013-12-29 11:11:43 +0000 (Sun, 29 Dec 2013)
New Revision: 15652

Added:
   trunk/packages/socket++/trunk/debian/patches/hurd3.patch
Modified:
   trunk/packages/socket++/trunk/debian/changelog
   trunk/packages/socket++/trunk/debian/patches/series
Log:
Fix hurd

Modified: trunk/packages/socket++/trunk/debian/changelog
===================================================================
--- trunk/packages/socket++/trunk/debian/changelog	2013-12-29 06:36:54 UTC (rev 15651)
+++ trunk/packages/socket++/trunk/debian/changelog	2013-12-29 11:11:43 UTC (rev 15652)
@@ -1,3 +1,9 @@
+socket++ (1.12.13-4) unstable; urgency=low
+
+  * Fix remaining issues on Hurd/kFreeBSD
+
+ -- Mathieu Malaterre <malat at debian.org>  Sun, 29 Dec 2013 12:07:03 +0100
+
 socket++ (1.12.13-3) unstable; urgency=low
 
   * Another round of fixes for Hurd/kFreeBSD

Added: trunk/packages/socket++/trunk/debian/patches/hurd3.patch
===================================================================
--- trunk/packages/socket++/trunk/debian/patches/hurd3.patch	                        (rev 0)
+++ trunk/packages/socket++/trunk/debian/patches/hurd3.patch	2013-12-29 11:11:43 UTC (rev 15652)
@@ -0,0 +1,26 @@
+Description: Fix compilation issue on kFreeBSD and HURD
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: no
+
+--- socket++-1.12.13.orig/socket++/sockinet.cpp
++++ socket++-1.12.13/socket++/sockinet.cpp
+@@ -36,6 +36,8 @@ typedef int socklen_t;
+ #	include <unistd.h>
+ #	include <errno.h>
+ #	include <netinet/tcp.h>
++# include <netinet/in.h>
++# include <arpa/inet.h>
+ 	EXTERN_C_END
+ #else
+ #	define socklen_t int
+--- socket++-1.12.13.orig/socket++/local.h
++++ socket++-1.12.13/socket++/local.h
+@@ -93,7 +93,7 @@ extern "C" int shutdown (int, int); // t
+ 
+ #if !(defined (__linux__) || defined(__FreeBSD__))
+ //  extern "C" int gethostname (char* hostname, int len);
+-#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__))
++#if !(defined(__FreeBSD__) || defined(__GNU__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__))
+   extern char* SYS_SIGLIST [];
+ #endif
+ #endif

Modified: trunk/packages/socket++/trunk/debian/patches/series
===================================================================
--- trunk/packages/socket++/trunk/debian/patches/series	2013-12-29 06:36:54 UTC (rev 15651)
+++ trunk/packages/socket++/trunk/debian/patches/series	2013-12-29 11:11:43 UTC (rev 15652)
@@ -1,2 +1,3 @@
 fixinfo.patch
 kfreebsd.patch
+hurd3.patch