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

[Mathieu Malaterre]

Author: malat
Date: 2013-12-30 13:19:14 +0000 (Mon, 30 Dec 2013)
New Revision: 15673

Added:
   trunk/packages/socket++/trunk/debian/patches/hurd4.patch
Modified:
   trunk/packages/socket++/trunk/debian/changelog
   trunk/packages/socket++/trunk/debian/patches/series
Log:
Next upload

Modified: trunk/packages/socket++/trunk/debian/changelog
===================================================================
--- trunk/packages/socket++/trunk/debian/changelog	2013-12-30 10:32:19 UTC (rev 15672)
+++ trunk/packages/socket++/trunk/debian/changelog	2013-12-30 13:19:14 UTC (rev 15673)
@@ -1,3 +1,9 @@
+socket++ (1.12.13-5) unstable; urgency=low
+
+  * Yet another round of fixes for Hurd/kFreeBSD
+
+ -- Mathieu Malaterre <malat at debian.org>  Mon, 30 Dec 2013 14:15:34 +0100
+
 socket++ (1.12.13-4) unstable; urgency=low
 
   * Fix remaining issues on Hurd/kFreeBSD

Added: trunk/packages/socket++/trunk/debian/patches/hurd4.patch
===================================================================
--- trunk/packages/socket++/trunk/debian/patches/hurd4.patch	                        (rev 0)
+++ trunk/packages/socket++/trunk/debian/patches/hurd4.patch	2013-12-30 13:19:14 UTC (rev 15673)
@@ -0,0 +1,28 @@
+Description: Fix compilation issue on kFreeBSD and HURD
+Author: Mathieu Malaterre <malat at debian.org>
+Forwarded: no
+
+--- socket++-1.12.13.orig/socket++/ftp.cpp
++++ socket++-1.12.13/socket++/ftp.cpp
+@@ -20,6 +20,10 @@
+ #include <stdio.h> // for sprintf
+ #include <errno.h>
+ 
++#include <sys/socket.h>
++#include <netinet/in.h>
++#include <arpa/inet.h>
++
+ using namespace std;
+ 
+ #if defined (__osf__) && defined (__DECCXX)
+--- socket++-1.12.13.orig/socket++/sockstream.h
++++ socket++-1.12.13/socket++/sockstream.h
+@@ -137,7 +137,7 @@ public:
+     msg_peek	        = MSG_PEEK,
+     msg_dontroute	= MSG_DONTROUTE,
+ 
+-#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__))
+     msg_maxiovlen	= MSG_MAXIOVLEN
+ #endif
+   };

Modified: trunk/packages/socket++/trunk/debian/patches/series
===================================================================
--- trunk/packages/socket++/trunk/debian/patches/series	2013-12-30 10:32:19 UTC (rev 15672)
+++ trunk/packages/socket++/trunk/debian/patches/series	2013-12-30 13:19:14 UTC (rev 15673)
@@ -1,3 +1,4 @@
 fixinfo.patch
 kfreebsd.patch
 hurd3.patch
+hurd4.patch