[med-svn] r15516 - trunk/packages/socket++/trunk/debian/patches

[Mathieu Malaterre]

Author: malat
Date: 2013-12-13 08:12:22 +0000 (Fri, 13 Dec 2013)
New Revision: 15516

Modified:
   trunk/packages/socket++/trunk/debian/patches/kfreebsd.patch
Log:
Update patch for Hurd/kFreeBSD

Modified: trunk/packages/socket++/trunk/debian/patches/kfreebsd.patch
===================================================================
--- trunk/packages/socket++/trunk/debian/patches/kfreebsd.patch	2013-12-12 13:41:53 UTC (rev 15515)
+++ trunk/packages/socket++/trunk/debian/patches/kfreebsd.patch	2013-12-13 08:12:22 UTC (rev 15516)
@@ -4,21 +4,36 @@
 
 Index: socket++-1.12.13/socket++/local.h
 ===================================================================
---- socket++-1.12.13.orig/socket++/local.h	2013-12-10 11:53:17.000000000 +0100
-+++ socket++-1.12.13/socket++/local.h	2013-12-10 11:54:26.000000000 +0100
-@@ -91,7 +91,7 @@
+--- socket++-1.12.13.orig/socket++/local.h	2013-12-13 09:11:52.000000000 +0100
++++ socket++-1.12.13/socket++/local.h	2013-12-13 09:11:55.000000000 +0100
+@@ -81,17 +81,19 @@
  
+ #if !defined (__linux__) // LN
+ extern "C" int shutdown (int, int); // they have forgotten this
++#else
++#   include <arpa/inet.h>
+ #endif
+ 
+ // <arpa/inet.h> does not have a prototype for inet_addr () and gethostname()
+-extern "C" unsigned long inet_addr (const char*);
++//extern "C" unsigned long inet_addr (const char*);
+ 
+ // arpa/in.h does not provide a protype for the following
+-extern "C" char* inet_ntoa (in_addr ina);
++//extern "C" char* inet_ntoa (in_addr ina);
+ 
  #if !(defined (__linux__) || defined(__FreeBSD__))
-   extern "C" int gethostname (char* hostname, int len);
+-  extern "C" int gethostname (char* hostname, int len);
 -#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__))
++//  extern "C" int gethostname (char* hostname, int len);
 +#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__))
    extern char* SYS_SIGLIST [];
  #endif
  #endif
 Index: socket++-1.12.13/socket++/sockstream.cpp
 ===================================================================
---- socket++-1.12.13.orig/socket++/sockstream.cpp	2013-12-10 11:56:48.000000000 +0100
-+++ socket++-1.12.13/socket++/sockstream.cpp	2013-12-10 11:57:23.000000000 +0100
+--- socket++-1.12.13.orig/socket++/sockstream.cpp	2013-12-13 09:11:52.000000000 +0100
++++ socket++-1.12.13/socket++/sockstream.cpp	2013-12-13 09:11:55.000000000 +0100
 @@ -232,7 +232,7 @@
    case EWOULDBLOCK:
  // On FreeBSD (and probably on Linux too) 
@@ -28,3 +43,25 @@
    case EAGAIN:
  #endif
      return true;
+Index: socket++-1.12.13/socket++/sockstream.h
+===================================================================
+--- socket++-1.12.13.orig/socket++/sockstream.h	2011-12-27 12:26:23.000000000 +0100
++++ socket++-1.12.13/socket++/sockstream.h	2013-12-13 09:11:55.000000000 +0100
+@@ -37,7 +37,7 @@
+ #	pragma comment(lib, "Wininet")
+ #endif
+ 
+-#ifdef __linux__
++#if defined(__linux__) /*|| defined(__FreeBSD_kernel__)*/
+ #  define MSG_MAXIOVLEN	 16
+ #endif // __linux__
+ 
+@@ -137,7 +137,7 @@
+     msg_peek	        = MSG_PEEK,
+     msg_dontroute	= MSG_DONTROUTE,
+ 
+-#if !(defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__))
++#if !(defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__bsdi__) || defined(__APPLE__))
+     msg_maxiovlen	= MSG_MAXIOVLEN
+ #endif
+   };